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

chrome/browser/command_updater.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/command_updater.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/observer_list.h"
 #include "base/stl_util.h"
+#include "chrome/browser/command_observer.h"
 
 CommandUpdater::CommandUpdaterDelegate::~CommandUpdaterDelegate() {
 }
 
 class CommandUpdater::Command {
  public:
   bool enabled;
   ObserverList<CommandObserver> observers;
 
   Command() : enabled(true) {}
@@ skipping 11 matching lines @@
   const CommandMap::const_iterator command(commands_.find(id));
   if (command == commands_.end())
     return false;
   return command->second->enabled;
 }
 
 bool CommandUpdater::SupportsCommand(int id) const {
   return commands_.find(id) != commands_.end();
 }
 
-void CommandUpdater::ExecuteCommand(int id) {
-  ExecuteCommandWithDisposition(id, CURRENT_TAB);
+bool CommandUpdater::ExecuteCommand(int id) {
+  return ExecuteCommandWithDisposition(id, CURRENT_TAB);
 }
 
-void CommandUpdater::ExecuteCommandWithDisposition(
+bool CommandUpdater::ExecuteCommandWithDisposition(
     int id,
     WindowOpenDisposition disposition) {
-  if (IsCommandEnabled(id))
+  if (SupportsCommand(id) && IsCommandEnabled(id)) {
     delegate_->ExecuteCommandWithDisposition(id, disposition);
+    return true;
+  }
+  return false;
 }
 
-CommandUpdater::CommandObserver::~CommandObserver() {
+CommandObserver::~CommandObserver() {
 }
 
 void CommandUpdater::UpdateCommandEnabled(int id, bool enabled) {
   Command* command = GetCommand(id, true);
   if (command->enabled == enabled)
     return;  // Nothing to do.
   command->enabled = enabled;
   FOR_EACH_OBSERVER(CommandObserver, command->observers,
                     EnabledStateChangedForCommand(id, enabled));
 }
@@ skipping 18 matching lines @@
 
 void CommandUpdater::RemoveCommandObserver(CommandObserver* observer) {
   for (CommandMap::const_iterator it = commands_.begin();
        it != commands_.end();
        ++it) {
     Command* command = it->second;
     if (command)
       command->observers.RemoveObserver(observer);
   }
 }