| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include <set> | 9 #include <set> |
| 10 | 10 |
| (...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 203 scoped_ptr<ui::SimpleMenuModel> wrench_menu_model_; | 203 scoped_ptr<ui::SimpleMenuModel> wrench_menu_model_; |
| 204 | 204 |
| 205 // Wrench menu. | 205 // Wrench menu. |
| 206 scoped_ptr<WrenchMenu> wrench_menu_; | 206 scoped_ptr<WrenchMenu> wrench_menu_; |
| 207 | 207 |
| 208 // A list of listeners to call when the menu opens. | 208 // A list of listeners to call when the menu opens. |
| 209 ObserverList<views::MenuListener> menu_listeners_; | 209 ObserverList<views::MenuListener> menu_listeners_; |
| 210 | 210 |
| 211 NotificationRegistrar registrar_; | 211 NotificationRegistrar registrar_; |
| 212 | 212 |
| 213 // Flag to invalidate the wrench menu model. |
| 214 bool is_wrench_menu_model_valid_; |
| 215 |
| 213 DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarView); | 216 DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarView); |
| 214 }; | 217 }; |
| 215 | 218 |
| 216 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_VIEW_H_ | 219 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_VIEW_H_ |
| OLD | NEW |