UpdateZoomControls honors the global enabled state of the zoom commands....

UpdateZoomControls honors the global enabled state of the zoom commands.
BUG=None
TEST=Test zooming.


Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=53221

[Elliot Glaysher, 2010-07-21 16:19:40]

LGTM

On Jul 20, 2010 8:47 PM, <sanjeevr@chromium.org> wrote:
> Reviewers: Elliot Glaysher,
>
> Description:
> UpdateZoomControls honors the global enabled state of the zoom commands.
> BUG=None
> TEST=Test zooming.
>
>
> Please review this at http://codereview.chromium.org/3055006/show
>
> SVN Base: svn://chrome-svn/chrome/trunk/src/
>
> Affected files:
> M chrome/browser/views/wrench_menu.cc
>
>
> Index: chrome/browser/views/wrench_menu.cc
> ===================================================================
> --- chrome/browser/views/wrench_menu.cc (revision 53070)
> +++ chrome/browser/views/wrench_menu.cc (working copy)
> @@ -456,10 +456,17 @@
> bool enable_increment, enable_decrement;
> int zoom_percent =
> static_cast<int>(GetZoom(&enable_increment, &enable_decrement));
> + enable_increment = enable_increment &&
> + menu_model_->IsEnabledAt(increment_button_->tag());
> + enable_decrement = enable_decrement &&
> + menu_model_->IsEnabledAt(decrement_button_->tag());
> + increment_button_->SetEnabled(enable_increment);
> + decrement_button_->SetEnabled(enable_decrement);
> zoom_label_->SetText(l10n_util::GetStringF(
> IDS_ZOOM_PERCENT,
> IntToWString(zoom_percent)));
> - increment_button_->SetEnabled(enable_increment);
> - decrement_button_->SetEnabled(enable_decrement);
> + // If both increment and decrement are disabled, then we disable the
> zoom
> + // label too.
> + zoom_label_->SetEnabled(enable_increment || enable_decrement);
> }
>
> double GetZoom(bool* enable_increment, bool* enable_decrement) {
>
>