Revert 126959 - Re-factor location bar/toolbar code to get rid of the browser dependency. This CL is needed to allow code reusing by captive portal view, which will show web content using DomView.

BUG=chromium-os:22630
TEST=browser_tests,unit_tests works

Review URL: http://codereview.chromium.org/9479008

TBR=altimofeev@chromium.org

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@127083 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 16 deletions

diff --git a/chrome/browser/command_updater.h b/chrome/browser/command_updater.h
index 80d8350..024658d 100644
--- a/chrome/browser/command_updater.h
+++ b/chrome/browser/command_updater.h
@@ -1,4 +1,4 @@
-// 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.
 
@@ -8,7 +8,6 @@
 
 #include "base/basictypes.h"
 #include "base/hash_tables.h"
-#include "webkit/glue/window_open_disposition.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 //
@@ -24,11 +23,8 @@ class CommandUpdater {
   // 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();
@@ -46,19 +42,11 @@ class CommandUpdater {
   // 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 {