Re-factor location bar/toolbar code to get rid of the browser dependency.

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

 // Copyright (c) 2012 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_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_
 #pragma once
 
 #include <string>
 #include <vector>
@@ skipping 15 matching lines @@
 
 #if defined(USE_AURA)
 #include "chrome/browser/ui/views/omnibox/omnibox_view_views.h"
 #elif defined(OS_WIN)
 #include "chrome/browser/ui/views/omnibox/omnibox_view_win.h"
 #elif defined(TOOLKIT_USES_GTK)
 #include "chrome/browser/ui/gtk/omnibox/omnibox_view_gtk.h"
 #endif
 
 class Browser;
+class BrowserShowContentRelated;
+class BrowserShowPageInfo;
 class ContentSettingImageView;
+class CommandUpdater;
 class EVBubbleView;
 class ExtensionAction;
 class GURL;
 class InstantController;
 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
 
 /////////////////////////////////////////////////////////////////////////////
 //
 // LocationBarView class
 //
 //   The LocationBarView class is a View subclass that paints the background
 //   of the URL bar strip and contains its content.
@@ skipping 19 matching lines @@
   int animation_offset() const { return animation_offset_; }
 
   class Delegate {
    public:
     // Should return the current tab contents.
     virtual TabContentsWrapper* GetTabContentsWrapper() const = 0;
 
     // Returns the InstantController, or NULL if there isn't one.
     virtual InstantController* GetInstant() = 0;
 
+    // Returns BrowserShowContentRelated to be used.
+    virtual BrowserShowContentRelated* GetBrowserShowContentRelated() = 0;

[sky, 2012/02/29 22:41:10]

Do we really need to expose objects for the methods you care about? Could the
methods you have in  BrowserShowActions be added directly here?

[altimofeev, 2012/03/01 10:05:39]

They could. But why is it better? BrowserShowAction is an interface for
Browser-like classes. LocationBarView::Delegate implementer seems different for
me.

[sky, 2012/03/01 16:34:47]

I believe you are arguing for a class per method approach. I agree that gives
you flexibility, but when you have a single class implementing it all it's
unneeded flexibility that makes the code harder to understand. LocationBarView
already has this Delegate class that is intended for functionality like you want
to add. It should be added here rather than effectively create more delegates.

[altimofeev, 2012/03/01 18:01:07]

I've gotten rid of "BrowserShow..." classes (one deleted, another renamed). I
left ContentSettingBubbleModelDelegate because ContentSettingBubbleModel is also
used by GTK version, and they pass Browser to it.

+
+    // Returns BrowserShowPageInfo to be used.
+    virtual BrowserShowPageInfo* GetBrowserShowPageInfo() = 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;

[sky, 2012/02/29 22:41:10]

nit: when you wrap, each param on its own line.

[altimofeev, 2012/03/01 10:05:39]

Done.

+
     // 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;
   };
 
   enum ColorKind {
     BACKGROUND = 0,
     TEXT,
     SELECTED_TEXT,
     DEEMPHASIZED_TEXT,
     SECURITY_TEXT,
   };
 
   // The modes reflect the different scenarios where a location bar can be used.
   // The normal mode is the mode used in a regular browser window.
   // In popup mode, the location bar view is read only and has a slightly
   // different presentation (font size / color).
   // In app launcher mode, the location bar is empty and no security states or
   // page/browser actions are displayed.
   enum Mode {
     NORMAL = 0,
     POPUP,
     APP_LAUNCHER
   };
 
-  LocationBarView(Browser* browser,
+  LocationBarView(Profile* profile,
+                  CommandUpdater* command_updater,
                   ToolbarModel* model,
                   Delegate* delegate,
                   Mode mode);
+
   virtual ~LocationBarView();
 
   void Init();
 
   // True if this instance has been initialized by calling Init, which can only
   // be called when the receiving instance is attached to a view container.
   bool IsInitialized() const;
 
   // Returns the appropriate color for the desired kind, based on the user's
   // system theme.
   static SkColor GetColor(ToolbarModel::SecurityLevel security_level,
                           ColorKind kind);
 
   // Updates the location bar.  We also reset the bar's permanent text and
   // security style, and, if |tab_for_state_restoring| is non-NULL, also restore
   // saved state that the tab holds.
   void Update(const content::WebContents* tab_for_state_restoring);
 
-  Browser* browser() const { return browser_; }
+  // Returns corresponding profile.
+  Profile* profile() const { return profile_; }
+
+  // Creates Widget for the given delegate.
+  views::Widget* CreateViewsBubble(views::BubbleDelegateView* bubble_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.
   // This is used by the ExtensionInstalledBubble to preview what the icon
   // will look like for the user upon installation of the extension.
   void SetPreviewEnabledPageAction(ExtensionAction *page_action,
                                    bool preview_enabled);
 
   // Retrieves the PageAction View which is associated with |page_action|.
@@ skipping 194 matching lines @@
   OmniboxViewWin* GetOmniboxViewWin();
 #endif
 #endif
 
   // Helper to show the first run info bubble.
   void ShowFirstRunBubbleInternal();
 
   // The Autocomplete Edit field.
   scoped_ptr<OmniboxView> location_entry_;
 
-  // The Browser object that corresponds to this View.
-  Browser* browser_;
+  Profile* profile_;
+  CommandUpdater* command_updater_;
 
   // The model.
   ToolbarModel* model_;
 
   // Our delegate.
   Delegate* delegate_;
 
   // This is the string of text from the autocompletion session that the user
   // entered or selected.
   string16 location_input_;
@@ skipping 63 matching lines @@
   // While animating, the host clips the widget and draws only the bottom
   // part of it. The view needs to know the pixel offset at which we are drawing
   // the widget so that we can draw the curved edges that attach to the toolbar
   // in the right location.
   int animation_offset_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(LocationBarView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_