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

chrome/browser/ui/toolbar/toolbar_model.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_MODEL_H_
 #define CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_MODEL_H_
 #pragma once
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/string16.h"
 
 class Browser;
 
 namespace content {
 class NavigationController;
+class WebContents;
 }
 
 namespace net {
 class X509Certificate;
 }
 
 // This class is the model used by the toolbar, location bar and autocomplete
 // edit.  It populates its states from the current navigation entry retrieved
 // from the navigation controller returned by GetNavigationController().
 class ToolbarModel {
  public:
   // TODO(wtc): unify ToolbarModel::SecurityLevel with SecurityStyle.  We
   // don't need two sets of security UI levels.  SECURITY_STYLE_AUTHENTICATED
   // needs to be refined into three levels: warning, standard, and EV.
   enum SecurityLevel {
     NONE = 0,          // HTTP/no URL/user is editing
     EV_SECURE,         // HTTPS with valid EV cert
     SECURE,            // HTTPS (non-EV)
     SECURITY_WARNING,  // HTTPS, but unable to check certificate revocation
                        // status or with insecure content on the page
     SECURITY_ERROR,    // Attempted HTTPS and failed, page not authenticated
     NUM_SECURITY_LEVELS,
   };
 
   explicit ToolbarModel(Browser* browser);

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

I don't like having these two modes, it's too error prone and going to break.

If you're going to remove dependencies you need to remove Browser entirely. If
you need to introduce an interface that is used to get things from Browser, do
that.

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

Done. See TabContentsWrapperContainer interface.

+  explicit ToolbarModel(content::WebContents* web_contents);
   ~ToolbarModel();
 
   // Returns the text that should be displayed in the location bar.
   string16 GetText() const;
 
   // Returns the security level that the toolbar should display.
   SecurityLevel GetSecurityLevel() const;
 
   // Returns the resource_id of the icon to show to the left of the address,
   // based on the current URL.  This doesn't cover specialized icons while the
@@ skipping 15 matching lines @@
 
   // Returns "<organization_name> [<country>]".
   static string16 GetEVCertName(const net::X509Certificate& cert);
 
  private:
   // Returns the navigation controller used to retrieve the navigation entry
   // from which the states are retrieved.
   // If this returns NULL, default values are used.
   content::NavigationController* GetNavigationController() const;
 
+  content::WebContents* GetSelectedWebContents() const;
+
   Browser* browser_;
+  content::WebContents* web_contents_;
 
   // Whether the text in the location bar is currently being edited.
   bool input_in_progress_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarModel);
 };
 
 #endif  // CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_MODEL_H_