Revert 126959 - Re-factor location bar/toolbar code to get rid of the browser dependency. This CL i…

chrome/browser/command_updater.cc

-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2006-2008 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"
@@ skipping 22 matching lines @@
   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);
-}
-
-void CommandUpdater::ExecuteCommandWithDisposition(
-    int id,
-    WindowOpenDisposition disposition) {
   if (IsCommandEnabled(id))
-    delegate_->ExecuteCommandWithDisposition(id, disposition);
+    delegate_->ExecuteCommand(id);
 }
 
 CommandUpdater::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;
@@ skipping 21 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);
   }
 }