| 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_ACTION_VIEW_H_ | 5 #ifndef CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_ACTION_VIEW_H_ |
| 6 #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_ACTION_VIEW_H_ | 6 #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_ACTION_VIEW_H_ |
| 7 | 7 |
| 8 #include "base/callback.h" | 8 #include "base/callback.h" |
| 9 #include "base/macros.h" | 9 #include "base/macros.h" |
| 10 #include "chrome/browser/ui/views/toolbar/toolbar_action_view_delegate_views.h" | 10 #include "chrome/browser/ui/views/toolbar/toolbar_action_view_delegate_views.h" |
| 11 #include "ui/views/context_menu_controller.h" | 11 #include "ui/views/context_menu_controller.h" |
| 12 #include "ui/views/controls/button/menu_button.h" | 12 #include "ui/views/controls/button/menu_button.h" |
| 13 #include "ui/views/controls/button/menu_button_listener.h" | 13 #include "ui/views/controls/button/menu_button_listener.h" |
| 14 #include "ui/views/controls/menu/menu_model_adapter.h" | 14 #include "ui/views/controls/menu/menu_model_adapter.h" |
| 15 #include "ui/views/drag_controller.h" | 15 #include "ui/views/drag_controller.h" |
| 16 #include "ui/views/view.h" | 16 #include "ui/views/view.h" |
| 17 | 17 |
| 18 class ExtensionAction; | |
| 19 | |
| 20 namespace extensions { | |
| 21 class Extension; | |
| 22 } | |
| 23 | |
| 24 namespace gfx { | |
| 25 class Image; | |
| 26 } | |
| 27 | |
| 28 namespace views { | 18 namespace views { |
| 29 class MenuItemView; | 19 class MenuItemView; |
| 30 class MenuModelAdapter; | 20 class MenuModelAdapter; |
| 31 class MenuRunner; | 21 class MenuRunner; |
| 32 } | 22 } |
| 33 | 23 |
| 34 //////////////////////////////////////////////////////////////////////////////// | 24 //////////////////////////////////////////////////////////////////////////////// |
| 35 // ToolbarActionView | 25 // ToolbarActionView |
| 36 // A wrapper around a ToolbarActionViewController to display a toolbar action | 26 // A wrapper around a ToolbarActionViewController to display a toolbar action |
| 37 // action in the BrowserActionsContainer. | 27 // action in the BrowserActionsContainer. |
| (...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 160 | 150 |
| 161 // The time the popup was last closed. | 151 // The time the popup was last closed. |
| 162 base::TimeTicks popup_closed_time_; | 152 base::TimeTicks popup_closed_time_; |
| 163 | 153 |
| 164 base::WeakPtrFactory<ToolbarActionView> weak_factory_; | 154 base::WeakPtrFactory<ToolbarActionView> weak_factory_; |
| 165 | 155 |
| 166 DISALLOW_COPY_AND_ASSIGN(ToolbarActionView); | 156 DISALLOW_COPY_AND_ASSIGN(ToolbarActionView); |
| 167 }; | 157 }; |
| 168 | 158 |
| 169 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_ACTION_VIEW_H_ | 159 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_ACTION_VIEW_H_ |
| OLD | NEW |