| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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_UI_VIEWS_TOOLBAR_VIEW_H_ | 5 #ifndef CHROME_BROWSER_UI_VIEWS_TOOLBAR_VIEW_H_ |
| 6 #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_VIEW_H_ | 6 #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_VIEW_H_ |
| 7 | 7 |
| 8 #include <set> | 8 #include <set> |
| 9 #include <string> | 9 #include <string> |
| 10 | 10 |
| (...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 231 BrowserActionsContainer* browser_actions_; | 231 BrowserActionsContainer* browser_actions_; |
| 232 views::MenuButton* app_menu_; | 232 views::MenuButton* app_menu_; |
| 233 Browser* browser_; | 233 Browser* browser_; |
| 234 | 234 |
| 235 // Contents of the profiles menu to populate with profile names. | 235 // Contents of the profiles menu to populate with profile names. |
| 236 scoped_ptr<ui::SimpleMenuModel> profiles_menu_contents_; | 236 scoped_ptr<ui::SimpleMenuModel> profiles_menu_contents_; |
| 237 | 237 |
| 238 // Controls whether or not a home button should be shown on the toolbar. | 238 // Controls whether or not a home button should be shown on the toolbar. |
| 239 BooleanPrefMember show_home_button_; | 239 BooleanPrefMember show_home_button_; |
| 240 | 240 |
| 241 // A pref that counts how often the bubble has been shown. |
| 242 IntegerPrefMember sideload_wipeout_bubble_shown_; |
| 243 |
| 241 // The display mode used when laying out the toolbar. | 244 // The display mode used when laying out the toolbar. |
| 242 DisplayMode display_mode_; | 245 DisplayMode display_mode_; |
| 243 | 246 |
| 244 // Wrench menu. | 247 // Wrench menu. |
| 245 scoped_ptr<WrenchMenu> wrench_menu_; | 248 scoped_ptr<WrenchMenu> wrench_menu_; |
| 246 scoped_ptr<WrenchMenuModel> wrench_menu_model_; | 249 scoped_ptr<WrenchMenuModel> wrench_menu_model_; |
| 247 | 250 |
| 248 // A list of listeners to call when the menu opens. | 251 // A list of listeners to call when the menu opens. |
| 249 ObserverList<views::MenuListener> menu_listeners_; | 252 ObserverList<views::MenuListener> menu_listeners_; |
| 250 | 253 |
| 251 content::NotificationRegistrar registrar_; | 254 content::NotificationRegistrar registrar_; |
| 252 | 255 |
| 253 DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarView); | 256 DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarView); |
| 254 }; | 257 }; |
| 255 | 258 |
| 256 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_VIEW_H_ | 259 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_VIEW_H_ |
| OLD | NEW |