Move command handling and updating off Browser and onto a helper object.

chrome/browser/ui/gtk/avatar_menu_button_gtk.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/gtk/avatar_menu_button_gtk.h"
 
 #include "base/i18n/rtl.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/command_updater.h"
 #include "chrome/browser/managed_mode.h"
 #include "chrome/browser/profiles/profile_metrics.h"
 #include "chrome/browser/profiles/profile_info_util.h"
 #include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/gtk/avatar_menu_bubble_gtk.h"
 #include "chrome/browser/ui/gtk/bubble/bubble_gtk.h"
 #include "ui/gfx/gtk_util.h"
 
 AvatarMenuButtonGtk::AvatarMenuButtonGtk(Browser* browser)
     : image_(NULL),
       browser_(browser),
       arrow_location_(BubbleGtk::ARROW_LOCATION_TOP_LEFT),
       is_gaia_picture_(false),
       old_height_(0) {
@@ skipping 36 matching lines @@
   return TRUE;
 }
 
 void AvatarMenuButtonGtk::OnSizeAllocate(GtkWidget* widget,
                                          GtkAllocation* allocation) {
   if (allocation->height != old_height_)
     UpdateButtonIcon();
 }
 
 void AvatarMenuButtonGtk::ShowAvatarBubble() {
-  DCHECK(browser_->command_updater()->IsCommandEnabled(IDC_SHOW_AVATAR_MENU));
+  DCHECK(chrome::IsCommandEnabled(browser_, IDC_SHOW_AVATAR_MENU));
   // Only show the avatar bubble if the avatar button is in the title bar.
   if (gtk_widget_get_parent_window(widget_.get()))
     new AvatarMenuBubbleGtk(browser_, widget_.get(), arrow_location_, NULL);
 }
 
 void AvatarMenuButtonGtk::UpdateButtonIcon() {
   if (!icon_.get())
     return;
 
   GtkAllocation allocation;
   gtk_widget_get_allocation(widget(), &allocation);
   old_height_ = allocation.height;
   gfx::Image icon = profiles::GetAvatarIconForTitleBar(*icon_, is_gaia_picture_,
       profiles::kAvatarIconWidth, old_height_);
   gtk_image_set_from_pixbuf(GTK_IMAGE(image_), icon.ToGdkPixbuf());
   gtk_misc_set_alignment(GTK_MISC(image_), 0.0, 1.0);
   gtk_widget_set_size_request(image_, -1, 0);
 }