Merge 53887 - Swap reload and home back to how they were in Chrome <= 5....

chrome/browser/views/toolbar_view.h

 // Copyright (c) 2010 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.
 
 #ifndef CHROME_BROWSER_VIEWS_TOOLBAR_VIEW_H_
 #define CHROME_BROWSER_VIEWS_TOOLBAR_VIEW_H_
 
 #include <vector>
 
 #include "app/menus/simple_menu_model.h"
@@ skipping 143 matching lines @@
 
   scoped_ptr<BackForwardMenuModel> back_menu_model_;
   scoped_ptr<BackForwardMenuModel> forward_menu_model_;
 
   // The model that contains the security level, text, icon to display...
   ToolbarModel* model_;
 
   // Controls
   views::ImageButton* back_;
   views::ImageButton* forward_;
+  ReloadButton* reload_;
   views::ImageButton* home_;
-  ReloadButton* reload_;
   LocationBarView* location_bar_;
   BrowserActionsContainer* browser_actions_;
   views::MenuButton* app_menu_;
   Profile* profile_;
   Browser* browser_;
 
   // Contents of the profiles menu to populate with profile names.
   scoped_ptr<menus::SimpleMenuModel> profiles_menu_contents_;
 
   // Controls whether or not a home button should be shown on the toolbar.
@@ skipping 28 matching lines @@
   // running.
   bool* destroyed_flag_;
 
   // When collapsed, the toolbar is just a tiny strip, no controls are visible.
   bool collapsed_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarView);
 };
 
 #endif  // CHROME_BROWSER_VIEWS_TOOLBAR_VIEW_H_