Declare variables in toolbar_button.

Fixes a warning.
Add more declarations.
Merge pull request #505 from jsha/declare-var

Declare variables in toolbar_button.