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

chrome/browser/ui/views/location_bar/click_handler.cc

 // 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.
 
 #include "chrome/browser/ui/views/location_bar/click_handler.h"
 
-#include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_show_actions.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents.h"
 #include "ui/views/view.h"
 
 using content::NavigationController;
 using content::NavigationEntry;
 using content::WebContents;
 
 ClickHandler::ClickHandler(const views::View* owner,
-                           LocationBarView* location_bar)
+                           LocationBarView* location_bar,
+                           BrowserShowPageInfo* delegate)
     : owner_(owner),
-      location_bar_(location_bar) {
+      location_bar_(location_bar),
+      delegate_(delegate) {
 }
 
 void ClickHandler::OnMouseReleased(const views::MouseEvent& event) {
   if (!owner_->HitTest(event.location()))
     return;
 
   // Do not show page info if the user has been editing the location
   // bar, or the location bar is at the NTP.
   if (location_bar_->location_entry()->IsEditingOrEmpty())
     return;
 
   WebContents* tab = location_bar_->GetTabContentsWrapper()->web_contents();
   const NavigationController& controller = tab->GetController();
   NavigationEntry* nav_entry = controller.GetActiveEntry();
   if (!nav_entry) {
     NOTREACHED();
     return;
   }
 
-  Browser* browser = Browser::GetBrowserForController(&controller, NULL);
-  browser->ShowPageInfo(tab, nav_entry->GetURL(), nav_entry->GetSSL(), true);
+  delegate_->ShowPageInfo(tab, nav_entry->GetURL(), nav_entry->GetSSL(), true);
 }