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

chrome/browser/command_updater.h

-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
 
 #ifndef CHROME_BROWSER_COMMAND_UPDATER_H_
 #define CHROME_BROWSER_COMMAND_UPDATER_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "base/hash_tables.h"
-#include "webkit/glue/window_open_disposition.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // CommandUpdater class
 //
 //   This object manages the enabled state of a set of commands. Observers
 //   register to listen to changes in this state so they can update their
 //   presentation.
 //
 class CommandUpdater {
  public:
   // A Delegate object implements this interface so that it can execute commands
   // when needed.
   class CommandUpdaterDelegate {
    public:
-    // Performs the action associated with the command with the specified ID and
-    // using the given disposition.
-    virtual void ExecuteCommandWithDisposition(
-        int id,
-        WindowOpenDisposition disposition) = 0;
+    // Perform the action associated with the command with the specified ID.
+    virtual void ExecuteCommand(int id) = 0;
 
    protected:
     virtual ~CommandUpdaterDelegate();
   };
 
   // Create a CommandUpdater with a CommandUpdaterDelegate to handle execution
   // of specific commands.
   explicit CommandUpdater(CommandUpdaterDelegate* handler);
   virtual ~CommandUpdater();
 
   // Returns true if the specified command ID is supported.
   bool SupportsCommand(int id) const;
 
   // Returns true if the specified command ID is enabled. The command ID must be
   // supported by this updater.
   bool IsCommandEnabled(int id) const;
 
-  // Performs the action associated with this command ID using CURRENT_TAB
-  // disposition.
+  // Performs the action associated with this command ID.
   // TODO(beng): get rid of this since it's effectively just a pass-thru and the
   // call sites would be better off using more well defined delegate interfaces.
   void ExecuteCommand(int id);
 
-  // Performs the action associated with this command ID using the given
-  // disposition.
-  // TODO(altimofeev): refactor the interface to provide more flexible and
-  // explicit way for passing command specific arguments. See
-  // NotificationDetails class for the possible implementation ideas.
-  void ExecuteCommandWithDisposition(int id, WindowOpenDisposition disposition);
-
   // An Observer interface implemented by objects that want to be informed when
   // the state of a particular command ID is modified.
   class CommandObserver {
    public:
     // Notifies the observer that the enabled state has changed for the
     // specified command id.
     virtual void EnabledStateChangedForCommand(int id, bool enabled) = 0;
 
    protected:
     virtual ~CommandObserver();
@@ skipping 29 matching lines @@
 
   // This is a map of command IDs to states and observer lists
   typedef base::hash_map<int, Command*> CommandMap;
   CommandMap commands_;
 
   CommandUpdater();
   DISALLOW_COPY_AND_ASSIGN(CommandUpdater);
 };
 
 #endif  // CHROME_BROWSER_COMMAND_UPDATER_H_