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

chrome/browser/ui/gtk/browser_titlebar.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/browser_titlebar.h"
 
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
 #include <string>
@@ skipping 920 matching lines @@
   }
 
   context_menu_->PopupAsContext(gfx::Point(event->x_root, event->y_root),
                                 event->time);
 }
 
 bool BrowserTitlebar::IsCommandIdEnabled(int command_id) const {
   if (command_id == kShowWindowDecorationsCommand)
     return true;
 
-  return browser_window_->browser()->command_updater()->
-      IsCommandEnabled(command_id);
+  return chrome::IsCommandEnabled(browser_window_->browser(), command_id);
 }
 
 bool BrowserTitlebar::IsCommandIdChecked(int command_id) const {
   if (command_id == kShowWindowDecorationsCommand) {
     PrefService* prefs = browser_window_->browser()->profile()->GetPrefs();
     return !prefs->GetBoolean(prefs::kUseCustomChromeFrame);
   }
 
   EncodingMenuController controller;
   if (controller.DoesCommandBelongToEncodingMenu(command_id)) {
@@ skipping 12 matching lines @@
 }
 
 void BrowserTitlebar::ExecuteCommand(int command_id) {
   if (command_id == kShowWindowDecorationsCommand) {
     PrefService* prefs = browser_window_->browser()->profile()->GetPrefs();
     prefs->SetBoolean(prefs::kUseCustomChromeFrame,
                   !prefs->GetBoolean(prefs::kUseCustomChromeFrame));
     return;
   }
 
-  browser_window_->browser()->ExecuteCommand(command_id);
+  chrome::ExecuteCommand(browser_window_->browser(), command_id);
 }
 
 bool BrowserTitlebar::GetAcceleratorForCommandId(
     int command_id, ui::Accelerator* accelerator) {
   const ui::AcceleratorGtk* accelerator_gtk =
       AcceleratorsGtk::GetInstance()->GetPrimaryAcceleratorForCommand(
           command_id);
   if (accelerator_gtk)
     *accelerator = *accelerator_gtk;
   return accelerator_gtk;
@@ skipping 68 matching lines @@
     ui::SimpleMenuModel::Delegate* delegate)
     : SimpleMenuModel(delegate) {
   AddItemWithStringId(IDC_NEW_TAB, IDS_TAB_CXMENU_NEWTAB);
   AddItemWithStringId(IDC_RESTORE_TAB, IDS_RESTORE_TAB);
   AddSeparator();
   AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER);
   AddSeparator();
   AddCheckItemWithStringId(kShowWindowDecorationsCommand,
                            IDS_SHOW_WINDOW_DECORATIONS_MENU);
 }