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 16 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 ContentSettingImageView;
+class CommandUpdater;
 class EVBubbleView;
 class ExtensionAction;
 class GURL;
 class InstantController;
 class KeywordHintView;
 class LocationIconView;
 class PageActionWithBadgeView;
+class Profile;
 class SelectedKeywordView;
 class StarView;
 class TabContentsWrapper;
 class TemplateURLService;
 
 #if defined(OS_WIN) || defined(USE_AURA)
 class SuggestedTextView;
 #endif
 
 /////////////////////////////////////////////////////////////////////////////
@@ skipping 50 matching lines @@
   // 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 browser. Could return NULL if there is no browser or
+  // WebContents hasn't been created yet.
+  // Note, to get profile use 'profile()' method below.
+  Browser* FindBrowser();

[sky, 2012/02/28 18:24:24]

Same comment here as with ToolbarModel.

[altimofeev, 2012/02/29 18:57:29]

Done. I've created interfaces BrowserShowContentRelated, BrowserShowPageInfo
(browser_show_actions.h) which are used by ContentSettingImageView and
ClickHandler. From the other hand, PageActionImageView deeply uses Browser, so
I've delegated creation of PageActionImageView to ToolbarView since I don't need
it.

+
+  // Returns corresponding profile.
+  Profile* profile() const { return profile_; }
 
   // 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.
+  Profile* profile_;
+  CommandUpdater* command_updater_;
+
+  // Cached value of the browser. Useful because searching needs O(N) time,
+  // where N is the number of tabs.
   Browser* browser_;
 
   // The model.
   ToolbarModel* model_;
 
   // Our delegate.
   Delegate* delegate_;
 
   // This is the string of text from the autocompletion session that the user
   // entered or selected.
@@ skipping 64 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_