OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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_TOOLBAR_VIEW_H_ | 5 #ifndef CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_VIEW_H_ |
6 #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_VIEW_H_ | 6 #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_VIEW_H_ |
7 | 7 |
| 8 #include <memory> |
| 9 |
8 #include "base/macros.h" | 10 #include "base/macros.h" |
9 #include "base/memory/scoped_ptr.h" | |
10 #include "base/observer_list.h" | 11 #include "base/observer_list.h" |
11 #include "chrome/browser/command_observer.h" | 12 #include "chrome/browser/command_observer.h" |
12 #include "chrome/browser/ui/toolbar/app_menu_badge_controller.h" | 13 #include "chrome/browser/ui/toolbar/app_menu_badge_controller.h" |
13 #include "chrome/browser/ui/toolbar/back_forward_menu_model.h" | 14 #include "chrome/browser/ui/toolbar/back_forward_menu_model.h" |
14 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" | 15 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" |
15 #include "components/prefs/pref_member.h" | 16 #include "components/prefs/pref_member.h" |
16 #include "ui/base/accelerators/accelerator.h" | 17 #include "ui/base/accelerators/accelerator.h" |
17 #include "ui/views/accessible_pane_view.h" | 18 #include "ui/views/accessible_pane_view.h" |
18 #include "ui/views/controls/button/menu_button.h" | 19 #include "ui/views/controls/button/menu_button.h" |
19 #include "ui/views/controls/button/menu_button_listener.h" | 20 #include "ui/views/controls/button/menu_button_listener.h" |
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
214 | 215 |
215 // The display mode used when laying out the toolbar. | 216 // The display mode used when laying out the toolbar. |
216 const DisplayMode display_mode_; | 217 const DisplayMode display_mode_; |
217 | 218 |
218 content::NotificationRegistrar registrar_; | 219 content::NotificationRegistrar registrar_; |
219 | 220 |
220 DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarView); | 221 DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarView); |
221 }; | 222 }; |
222 | 223 |
223 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_VIEW_H_ | 224 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_VIEW_H_ |
OLD | NEW |