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

chrome/browser/ui/views/location_bar/location_bar_view.h

Index: chrome/browser/ui/views/location_bar/location_bar_view.h
===================================================================
--- chrome/browser/ui/views/location_bar/location_bar_view.h	(revision 127082)
+++ chrome/browser/ui/views/location_bar/location_bar_view.h	(working copy)
@@ -32,9 +32,8 @@
 #include "chrome/browser/ui/gtk/omnibox/omnibox_view_gtk.h"
 #endif
 
+class Browser;
 class ChromeToMobileView;
-class CommandUpdater;
-class ContentSettingBubbleModelDelegate;
 class ContentSettingImageView;
 class EVBubbleView;
 class ExtensionAction;
@@ -43,18 +42,11 @@
 class KeywordHintView;
 class LocationIconView;
 class PageActionWithBadgeView;
-class PageActionImageView;
-class Profile;
 class SelectedKeywordView;
 class StarView;
 class TabContentsWrapper;
 class TemplateURLService;
 
-namespace views {
-class BubbleDelegateView;
-class Widget;
-}
-
 #if defined(OS_WIN) || defined(USE_AURA)
 class SuggestedTextView;
 #endif
@@ -94,32 +86,10 @@
     // Returns the InstantController, or NULL if there isn't one.
     virtual InstantController* GetInstant() = 0;
 
-    // Creates Widget for the given delegate.
-    virtual views::Widget* CreateViewsBubble(
-        views::BubbleDelegateView* bubble_delegate) = 0;
-
-    // Creates PageActionImageView. Caller gets an ownership.
-    virtual PageActionImageView* CreatePageActionImageView(
-        LocationBarView* owner,
-        ExtensionAction* action) = 0;
-
-    // Returns ContentSettingBubbleModelDelegate.
-    virtual ContentSettingBubbleModelDelegate*
-        GetContentSettingBubbleModelDelegate() = 0;
-
-    // Shows page information in the given web contents.
-    virtual void ShowPageInfo(content::WebContents* web_contents,
-                              const GURL& url,
-                              const content::SSLStatus& ssl,
-                              bool show_history) = 0;
-
     // Called by the location bar view when the user starts typing in the edit.
     // This forces our security style to be UNKNOWN for the duration of the
     // editing.
     virtual void OnInputInProgress(bool in_progress) = 0;
-
-   protected:
-    virtual ~Delegate() {}
   };
 
   enum ColorKind {
@@ -142,12 +112,10 @@
     APP_LAUNCHER
   };
 
-  LocationBarView(Profile* profile,
-                  CommandUpdater* command_updater,
+  LocationBarView(Browser* browser,
                   ToolbarModel* model,
                   Delegate* delegate,
                   Mode mode);
-
   virtual ~LocationBarView();
 
   void Init();
@@ -166,12 +134,8 @@
   // saved state that the tab holds.
   void Update(const content::WebContents* tab_for_state_restoring);
 
-  // Returns corresponding profile.
-  Profile* profile() const { return profile_; }
+  Browser* browser() const { return browser_; }
 
-  // Returns the delegate.
-  Delegate* delegate() const { return delegate_; }
-
   // Sets |preview_enabled| for the PageAction View associated with this
   // |page_action|. If |preview_enabled| is true, the view will display the
   // PageActions icon even though it has not been activated by the extension.
@@ -388,12 +352,9 @@
   // The Autocomplete Edit field.
   scoped_ptr<OmniboxView> location_entry_;
 
-  // The profile which corresponds to this View.
-  Profile* profile_;
+  // The Browser object that corresponds to this View.
+  Browser* browser_;
 
-  // Command updater which corresponds to this View.
-  CommandUpdater* command_updater_;
-
   // The model.
   ToolbarModel* model_;