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

chrome/browser/ui/views/reload_button.cc

Index: chrome/browser/ui/views/reload_button.cc
diff --git a/chrome/browser/ui/views/reload_button.cc b/chrome/browser/ui/views/reload_button.cc
index 34b78578346280a6028103087eef05c571136dc6..0b25edfe245d78070d2c1af5ac34af77f729a9d4 100644
--- a/chrome/browser/ui/views/reload_button.cc
+++ b/chrome/browser/ui/views/reload_button.cc
@@ -6,7 +6,7 @@
 
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
-#include "chrome/browser/ui/browser.h"
+#include "chrome/browser/command_updater.h"
 #include "chrome/browser/ui/views/event_utils.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "grit/generated_resources.h"
@@ -19,10 +19,11 @@ const char ReloadButton::kViewClassName[] = "browser/ui/views/ReloadButton";
 ////////////////////////////////////////////////////////////////////////////////
 // ReloadButton, public:
 
-ReloadButton::ReloadButton(LocationBarView* location_bar, Browser* browser)
+ReloadButton::ReloadButton(LocationBarView* location_bar,
+                           CommandUpdater* command_updater)
     : ALLOW_THIS_IN_INITIALIZER_LIST(ToggleImageButton(this)),
       location_bar_(location_bar),
-      browser_(browser),
+      command_updater_(command_updater),
       intended_mode_(MODE_RELOAD),
       visible_mode_(MODE_RELOAD),
       double_click_timer_delay_(
@@ -72,16 +73,14 @@ void ReloadButton::ChangeMode(Mode mode, bool force) {
 void ReloadButton::ButtonPressed(views::Button* /* button */,
                                  const views::Event& event) {
   if (visible_mode_ == MODE_STOP) {
-    if (browser_)
-      browser_->Stop();
+    if (command_updater_)
+      command_updater_->ExecuteCommandWithDisposition(IDC_STOP, CURRENT_TAB);
     // The user has clicked, so we can feel free to update the button,
     // even if the mouse is still hovering.
     ChangeMode(MODE_RELOAD, true);
   } else if (!double_click_timer_.IsRunning()) {
     // Shift-clicking or ctrl-clicking the reload button means we should ignore
     // any cached content.
-    // TODO(avayvod): eliminate duplication of this logic in
-    // CompactLocationBarView.
     int command;
     int flags = mouse_event_flags();
     if (event.IsShiftDown() || event.IsControlDown()) {
@@ -109,8 +108,9 @@ void ReloadButton::ButtonPressed(views::Button* /* button */,
     double_click_timer_.Start(FROM_HERE, double_click_timer_delay_, this,
                               &ReloadButton::OnDoubleClickTimer);
 
-    if (browser_)
-      browser_->ExecuteCommandWithDisposition(command, disposition);
+    if (command_updater_) {

[sky, 2012/03/12 20:59:19]

nit: no {}

[altimofeev, 2012/03/13 15:38:05]

Done.

+      command_updater_->ExecuteCommandWithDisposition(command, disposition);
+    }
     ++testing_reload_count_;
   }
 }