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

chrome/browser/ui/views/reload_button.cc

 // 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.
 
 #include "chrome/browser/ui/views/reload_button.h"
 
 #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"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/views/metrics.h"
 
 // static
 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_(
           base::TimeDelta::FromMilliseconds(views::GetDoubleClickInterval())),
       stop_to_reload_timer_delay_(base::TimeDelta::FromMilliseconds(1350)),
       testing_mouse_hovered_(false),
       testing_reload_count_(0) {
 }
 
 ReloadButton::~ReloadButton() {
@@ skipping 29 matching lines @@
     }
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ReloadButton, views::ButtonListener implementation:
 
 void ReloadButton::ButtonPressed(views::Button* /* button */,
                                  const views::Event& event) {
   if (visible_mode_ == MODE_STOP) {
-    if (browser_)
-      browser_->Stop();
+    if (command_updater_)
+      command_updater_->ExecuteCommand(IDC_STOP);
     // 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()) {
       command = IDC_RELOAD_IGNORING_CACHE;
-      // Mask off Shift and Control so they don't affect the disposition below.
-      flags &= ~(ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN);
     } else {
       command = IDC_RELOAD;
     }
 
-    WindowOpenDisposition disposition =
-        event_utils::DispositionFromEventFlags(flags);
-    if ((disposition == CURRENT_TAB) && location_bar_) {
+    if (location_bar_) {
       // Forcibly reset the location bar, since otherwise it won't discard any
       // ongoing user edits, since it doesn't realize this is a user-initiated
       // action.
       location_bar_->Revert();
     }
 
     // Start a timer - while this timer is running, the reload button cannot be
     // changed to a stop button.  We do not set |intended_mode_| to MODE_STOP
     // here as the browser will do that when it actually starts loading (which
     // may happen synchronously, thus the need to do this before telling the
     // browser to execute the reload command).
     double_click_timer_.Start(FROM_HERE, double_click_timer_delay_, this,
                               &ReloadButton::OnDoubleClickTimer);
 
-    if (browser_)
-      browser_->ExecuteCommandWithDisposition(command, disposition);

[sky, 2012/03/07 23:32:38]

Doesn't this lose the disposition?

[altimofeev, 2012/03/11 14:53:07]

Yes it does. Actually, I thought that reload button should only reload the
active tab. But it appeared that there is no other mean to open the same URL in
a new tab (after 'Go' button was illuminated). Also I used to 'Ctrl' + click
behavior, which is anyway overwritten by this button. From the other hand,
middle button click or Command + click (Mac only) will stop working after this
kind of change.

Final decision: I've changed CommandUpdater to be able to pass disposition
explicitly.

+    if (command_updater_)
+      command_updater_->ExecuteCommand(command);
     ++testing_reload_count_;
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ReloadButton, View overrides:
 
 void ReloadButton::OnMouseExited(const views::MouseEvent& event) {
   ChangeMode(intended_mode_, true);
   if (state() != BS_DISABLED)
@@ skipping 15 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // ReloadButton, private:
 
 void ReloadButton::OnDoubleClickTimer() {
   ChangeMode(intended_mode_, false);
 }
 
 void ReloadButton::OnStopToReloadTimer() {
   ChangeMode(intended_mode_, true);
 }