Merge Chromium at r65505: Initial merge by git.

Change-Id: I31d8f1d8cd33caaf7f47ffa7350aef42d5fbdb45

1 files changed, 24 insertions, 5 deletions

diff --git a/chrome/browser/views/reload_button.h b/chrome/browser/views/reload_button.h
index 6a8c29c..0c253bf 100644
--- a/chrome/browser/views/reload_button.h
+++ b/chrome/browser/views/reload_button.h
@@ -7,6 +7,7 @@
 #pragma once
 
 #include "base/basictypes.h"
+#include "base/gtest_prod_util.h"
 #include "base/timer.h"
 #include "views/controls/button/image_button.h"
 
@@ -37,26 +38,44 @@ class ReloadButton : public views::ToggleImageButton,
   void ChangeMode(Mode mode, bool force);
 
   // Overridden from views::ButtonListener:
-  virtual void ButtonPressed(views::Button* button, const views::Event& event);
+  virtual void ButtonPressed(views::Button* /* button */,
+                             const views::Event& event);
 
   // Overridden from views::View:
   virtual void OnMouseExited(const views::MouseEvent& e);
   virtual bool GetTooltipText(const gfx::Point& p, std::wstring* tooltip);
 
  private:
-  void OnButtonTimer();
+  friend class ReloadButtonTest;
 
-  base::OneShotTimer<ReloadButton> timer_;
+  void OnDoubleClickTimer();
+  void OnStopToReloadTimer();
 
+  base::OneShotTimer<ReloadButton> double_click_timer_;
+  base::OneShotTimer<ReloadButton> stop_to_reload_timer_;
+
+  // These may be NULL when testing.
   LocationBarView* location_bar_;
   Browser* browser_;
 
-  // The mode we should be in
+  // The mode we should be in assuming no timers are running.
   Mode intended_mode_;
 
-  // The currently-visible mode - this may different from the intended mode
+  // The currently-visible mode - this may differ from the intended mode.
   Mode visible_mode_;
 
+  // The delay times for the timers.  These are members so that tests can modify
+  // them.
+  base::TimeDelta double_click_timer_delay_;
+  base::TimeDelta stop_to_reload_timer_delay_;
+
+  // TESTING ONLY
+  // True if we should pretend the button is hovered.
+  bool testing_mouse_hovered_;
+  // Increments when we would tell the browser to "reload", so
+  // test code can tell whether we did so (as there may be no |browser_|).
+  int testing_reload_count_;
+
   DISALLOW_IMPLICIT_CONSTRUCTORS(ReloadButton);
 };