| 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 209 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 220 | 220 |
| 221 // Controls whether or not a home button should be shown on the toolbar. | 221 // Controls whether or not a home button should be shown on the toolbar. |
| 222 BooleanPrefMember show_home_button_; | 222 BooleanPrefMember show_home_button_; |
| 223 | 223 |
| 224 // A pref that counts how often the bubble has been shown. | 224 // A pref that counts how often the bubble has been shown. |
| 225 IntegerPrefMember sideload_wipeout_bubble_shown_; | 225 IntegerPrefMember sideload_wipeout_bubble_shown_; |
| 226 | 226 |
| 227 // The display mode used when laying out the toolbar. | 227 // The display mode used when laying out the toolbar. |
| 228 DisplayMode display_mode_; | 228 DisplayMode display_mode_; |
| 229 | 229 |
| 230 // Wrench menu. | 230 // Wrench model and menu. |
| 231 // Note that the menu should be destroyed before the model it uses, so the |
| 232 // menu should be listed later. |
| 233 scoped_ptr<WrenchMenuModel> wrench_menu_model_; |
| 231 scoped_ptr<WrenchMenu> wrench_menu_; | 234 scoped_ptr<WrenchMenu> wrench_menu_; |
| 232 scoped_ptr<WrenchMenuModel> wrench_menu_model_; | |
| 233 | 235 |
| 234 // A list of listeners to call when the menu opens. | 236 // A list of listeners to call when the menu opens. |
| 235 ObserverList<views::MenuListener> menu_listeners_; | 237 ObserverList<views::MenuListener> menu_listeners_; |
| 236 | 238 |
| 237 content::NotificationRegistrar registrar_; | 239 content::NotificationRegistrar registrar_; |
| 238 | 240 |
| 239 DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarView); | 241 DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarView); |
| 240 }; | 242 }; |
| 241 | 243 |
| 242 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_VIEW_H_ | 244 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_VIEW_H_ |
| OLD | NEW |