| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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_EXTENSION_TOOLBAR_MENU_VIEW_H_ | 5 #ifndef CHROME_BROWSER_UI_VIEWS_TOOLBAR_EXTENSION_TOOLBAR_MENU_VIEW_H_ |
| 6 #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_EXTENSION_TOOLBAR_MENU_VIEW_H_ | 6 #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_EXTENSION_TOOLBAR_MENU_VIEW_H_ |
| 7 | 7 |
| 8 #include "base/macros.h" |
| 8 #include "base/memory/weak_ptr.h" | 9 #include "base/memory/weak_ptr.h" |
| 9 #include "base/scoped_observer.h" | 10 #include "base/scoped_observer.h" |
| 10 #include "chrome/browser/ui/toolbar/toolbar_actions_bar_observer.h" | 11 #include "chrome/browser/ui/toolbar/toolbar_actions_bar_observer.h" |
| 11 #include "ui/views/controls/scroll_view.h" | 12 #include "ui/views/controls/scroll_view.h" |
| 12 | 13 |
| 13 class AppMenu; | 14 class AppMenu; |
| 14 class Browser; | 15 class Browser; |
| 15 class BrowserActionsContainer; | 16 class BrowserActionsContainer; |
| 16 class ToolbarActionsBar; | 17 class ToolbarActionsBar; |
| 17 | 18 |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 73 | 74 |
| 74 ScopedObserver<ToolbarActionsBar, ToolbarActionsBarObserver> | 75 ScopedObserver<ToolbarActionsBar, ToolbarActionsBarObserver> |
| 75 toolbar_actions_bar_observer_; | 76 toolbar_actions_bar_observer_; |
| 76 | 77 |
| 77 base::WeakPtrFactory<ExtensionToolbarMenuView> weak_factory_; | 78 base::WeakPtrFactory<ExtensionToolbarMenuView> weak_factory_; |
| 78 | 79 |
| 79 DISALLOW_COPY_AND_ASSIGN(ExtensionToolbarMenuView); | 80 DISALLOW_COPY_AND_ASSIGN(ExtensionToolbarMenuView); |
| 80 }; | 81 }; |
| 81 | 82 |
| 82 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_EXTENSION_TOOLBAR_MENU_VIEW_H_ | 83 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_EXTENSION_TOOLBAR_MENU_VIEW_H_ |
| OLD | NEW |