Detach reload from omnibox, combine with stop, and eliminate go.

This does the basic surgery on all three OSes without trying to fix up the visual appearance.  As a result, things look pretty ugly.  My intent is to at least put endcaps on the omnibox in a subsequent patch.

BUG=45745,45762,45763
TEST=Reload and stop should be combined; go should be gone.
Review URL: http://codereview.chromium.org/2677003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49492 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 4 insertions, 4 deletions

diff --git a/chrome/browser/views/frame/browser_view.cc b/chrome/browser/views/frame/browser_view.cc
index 7bc300f..b6d5c94 100644
--- a/chrome/browser/views/frame/browser_view.cc
+++ b/chrome/browser/views/frame/browser_view.cc
@@ -858,9 +858,9 @@ void BrowserView::SetFocusToLocationBar(bool select_all) {
   }
 }
 
-void BrowserView::UpdateStopGoState(bool is_loading, bool force) {
-  toolbar_->go_button()->ChangeMode(
-      is_loading ? GoButton::MODE_STOP : GoButton::MODE_GO, force);
+void BrowserView::UpdateReloadStopState(bool is_loading, bool force) {
+  toolbar_->reload_button()->ChangeMode(
+      is_loading ? ReloadButton::MODE_STOP : ReloadButton::MODE_RELOAD, force);
 }
 
 void BrowserView::UpdateToolbar(TabContents* contents,
diff --git a/chrome/browser/views/frame/browser_view.h b/chrome/browser/views/frame/browser_view.h
index a4cdd57..6c6c4b4 100644
--- a/chrome/browser/views/frame/browser_view.h
+++ b/chrome/browser/views/frame/browser_view.h
@@ -283,7 +283,7 @@ class BrowserView : public BrowserBubbleHost,
   virtual bool IsFullscreen() const;
   virtual LocationBar* GetLocationBar() const;
   virtual void SetFocusToLocationBar(bool select_all);
-  virtual void UpdateStopGoState(bool is_loading, bool force);
+  virtual void UpdateReloadStopState(bool is_loading, bool force);
   virtual void UpdateToolbar(TabContents* contents, bool should_restore_state);
   virtual void FocusToolbar();
   virtual void FocusPageAndAppMenus();