Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(275)

Side by Side Diff: chrome/browser/views/toolbar_view.h

Issue 3056023: Swap reload and home back to how they were in Chrome <= 5.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 10 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/views/toolbar_view.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_VIEWS_TOOLBAR_VIEW_H_ 5 #ifndef CHROME_BROWSER_VIEWS_TOOLBAR_VIEW_H_
6 #define CHROME_BROWSER_VIEWS_TOOLBAR_VIEW_H_ 6 #define CHROME_BROWSER_VIEWS_TOOLBAR_VIEW_H_
7 #pragma once 7 #pragma once
8 8
9 #include <vector> 9 #include <vector>
10 10
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 164
165 scoped_ptr<BackForwardMenuModel> back_menu_model_; 165 scoped_ptr<BackForwardMenuModel> back_menu_model_;
166 scoped_ptr<BackForwardMenuModel> forward_menu_model_; 166 scoped_ptr<BackForwardMenuModel> forward_menu_model_;
167 167
168 // The model that contains the security level, text, icon to display... 168 // The model that contains the security level, text, icon to display...
169 ToolbarModel* model_; 169 ToolbarModel* model_;
170 170
171 // Controls 171 // Controls
172 views::ImageButton* back_; 172 views::ImageButton* back_;
173 views::ImageButton* forward_; 173 views::ImageButton* forward_;
174 ReloadButton* reload_;
174 views::ImageButton* home_; 175 views::ImageButton* home_;
175 ReloadButton* reload_;
176 LocationBarView* location_bar_; 176 LocationBarView* location_bar_;
177 BrowserActionsContainer* browser_actions_; 177 BrowserActionsContainer* browser_actions_;
178 views::MenuButton* app_menu_; 178 views::MenuButton* app_menu_;
179 Profile* profile_; 179 Profile* profile_;
180 Browser* browser_; 180 Browser* browser_;
181 181
182 // Contents of the profiles menu to populate with profile names. 182 // Contents of the profiles menu to populate with profile names.
183 scoped_ptr<menus::SimpleMenuModel> profiles_menu_contents_; 183 scoped_ptr<menus::SimpleMenuModel> profiles_menu_contents_;
184 184
185 // Controls whether or not a home button should be shown on the toolbar. 185 // Controls whether or not a home button should be shown on the toolbar.
(...skipping 25 matching lines...) Expand all
211 211
212 // If non-null the destructor sets this to true. This is set to a non-null 212 // If non-null the destructor sets this to true. This is set to a non-null
213 // while the menu is showing and used to detect if the menu was deleted while 213 // while the menu is showing and used to detect if the menu was deleted while
214 // running. 214 // running.
215 bool* destroyed_flag_; 215 bool* destroyed_flag_;
216 216
217 DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarView); 217 DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarView);
218 }; 218 };
219 219
220 #endif // CHROME_BROWSER_VIEWS_TOOLBAR_VIEW_H_ 220 #endif // CHROME_BROWSER_VIEWS_TOOLBAR_VIEW_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/views/toolbar_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698