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

chrome/browser/ui/toolbar/toolbar_model.h

Index: chrome/browser/ui/toolbar/toolbar_model.h
===================================================================
--- chrome/browser/ui/toolbar/toolbar_model.h	(revision 127082)
+++ chrome/browser/ui/toolbar/toolbar_model.h	(working copy)
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
@@ -11,7 +11,7 @@
 #include "base/basictypes.h"
 #include "base/string16.h"
 
-class ToolbarModelDelegate;
+class Browser;
 
 namespace content {
 class NavigationController;
@@ -39,7 +39,7 @@
     NUM_SECURITY_LEVELS,
   };
 
-  explicit ToolbarModel(ToolbarModelDelegate* delegate);
+  explicit ToolbarModel(Browser* browser);
   ~ToolbarModel();
 
   // Returns the text that should be displayed in the location bar.
@@ -75,7 +75,7 @@
   // If this returns NULL, default values are used.
   content::NavigationController* GetNavigationController() const;
 
-  ToolbarModelDelegate* delegate_;
+  Browser* browser_;
 
   // Whether the text in the location bar is currently being edited.
   bool input_in_progress_;