OLD | NEW |
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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 | 7 |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/ref_counted.h" | 10 #include "base/ref_counted.h" |
11 #include "base/scoped_ptr.h" | 11 #include "base/scoped_ptr.h" |
12 #include "chrome/browser/bubble_positioner.h" | 12 #include "chrome/browser/bubble_positioner.h" |
13 #include "chrome/browser/command_updater.h" | 13 #include "chrome/browser/command_updater.h" |
14 #include "chrome/browser/user_data_manager.h" | 14 #include "chrome/browser/user_data_manager.h" |
15 #include "chrome/browser/views/go_button.h" | 15 #include "chrome/browser/views/go_button.h" |
16 #include "chrome/browser/views/location_bar_view.h" | 16 #include "chrome/browser/views/location_bar_view.h" |
17 #include "chrome/common/pref_member.h" | 17 #include "chrome/common/pref_member.h" |
18 #include "views/controls/button/menu_button.h" | 18 #include "views/controls/button/menu_button.h" |
19 #include "views/controls/menu/menu.h" | 19 #include "views/controls/menu/menu.h" |
20 #include "views/controls/menu/simple_menu_model.h" | 20 #include "views/controls/menu/simple_menu_model.h" |
21 #include "views/controls/menu/view_menu_delegate.h" | 21 #include "views/controls/menu/view_menu_delegate.h" |
22 #include "views/view.h" | 22 #include "views/view.h" |
23 | 23 |
24 class BackForwardMenuModelViews; | 24 class BackForwardMenuModelViews; |
| 25 class BrowserActionsContainer; |
25 class Browser; | 26 class Browser; |
26 class Profile; | 27 class Profile; |
27 class ToolbarStarToggle; | 28 class ToolbarStarToggle; |
28 namespace views { | 29 namespace views { |
29 class SimpleMenuModel; | 30 class SimpleMenuModel; |
30 } | 31 } |
31 | 32 |
32 // A menu model that builds the contents of an encoding menu. | 33 // A menu model that builds the contents of an encoding menu. |
33 class EncodingMenuModel : public views::SimpleMenuModel, | 34 class EncodingMenuModel : public views::SimpleMenuModel, |
34 public views::SimpleMenuModel::Delegate { | 35 public views::SimpleMenuModel::Delegate { |
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
212 views::View* acc_focused_view_; | 213 views::View* acc_focused_view_; |
213 | 214 |
214 // Controls | 215 // Controls |
215 views::ImageButton* back_; | 216 views::ImageButton* back_; |
216 views::ImageButton* forward_; | 217 views::ImageButton* forward_; |
217 views::ImageButton* reload_; | 218 views::ImageButton* reload_; |
218 views::ImageButton* home_; | 219 views::ImageButton* home_; |
219 ToolbarStarToggle* star_; | 220 ToolbarStarToggle* star_; |
220 LocationBarView* location_bar_; | 221 LocationBarView* location_bar_; |
221 GoButton* go_; | 222 GoButton* go_; |
| 223 BrowserActionsContainer* browser_actions_; |
222 views::MenuButton* page_menu_; | 224 views::MenuButton* page_menu_; |
223 views::MenuButton* app_menu_; | 225 views::MenuButton* app_menu_; |
224 // The bookmark menu button. This may be null. | 226 // The bookmark menu button. This may be null. |
225 views::MenuButton* bookmark_menu_; | 227 views::MenuButton* bookmark_menu_; |
226 Profile* profile_; | 228 Profile* profile_; |
227 Browser* browser_; | 229 Browser* browser_; |
228 | 230 |
229 // Contents of the profiles menu to populate with profile names. | 231 // Contents of the profiles menu to populate with profile names. |
230 scoped_ptr<views::SimpleMenuModel> profiles_menu_contents_; | 232 scoped_ptr<views::SimpleMenuModel> profiles_menu_contents_; |
231 | 233 |
(...skipping 12 matching lines...) Expand all Loading... |
244 scoped_ptr<EncodingMenuModel> encoding_menu_contents_; | 246 scoped_ptr<EncodingMenuModel> encoding_menu_contents_; |
245 scoped_ptr<views::SimpleMenuModel> devtools_menu_contents_; | 247 scoped_ptr<views::SimpleMenuModel> devtools_menu_contents_; |
246 scoped_ptr<views::SimpleMenuModel> app_menu_contents_; | 248 scoped_ptr<views::SimpleMenuModel> app_menu_contents_; |
247 | 249 |
248 // TODO(beng): build these into MenuButton. | 250 // TODO(beng): build these into MenuButton. |
249 scoped_ptr<views::Menu2> page_menu_menu_; | 251 scoped_ptr<views::Menu2> page_menu_menu_; |
250 scoped_ptr<views::Menu2> app_menu_menu_; | 252 scoped_ptr<views::Menu2> app_menu_menu_; |
251 }; | 253 }; |
252 | 254 |
253 #endif // CHROME_BROWSER_VIEWS_TOOLBAR_VIEW_H_ | 255 #endif // CHROME_BROWSER_VIEWS_TOOLBAR_VIEW_H_ |
OLD | NEW |