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 "chrome/browser/ui/views/toolbar/toolbar_action_view_delegate_views.h" | 10 #include "chrome/browser/ui/views/toolbar/toolbar_action_view_delegate_views.h" |
10 #include "ui/views/animation/ink_drop_host.h" | 11 #include "ui/views/animation/ink_drop_host.h" |
11 #include "ui/views/context_menu_controller.h" | 12 #include "ui/views/context_menu_controller.h" |
12 #include "ui/views/controls/button/menu_button.h" | 13 #include "ui/views/controls/button/menu_button.h" |
13 #include "ui/views/controls/button/menu_button_listener.h" | 14 #include "ui/views/controls/button/menu_button_listener.h" |
14 #include "ui/views/drag_controller.h" | 15 #include "ui/views/drag_controller.h" |
15 #include "ui/views/view.h" | 16 #include "ui/views/view.h" |
16 | 17 |
17 class ExtensionAction; | 18 class ExtensionAction; |
18 class Profile; | 19 class Profile; |
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
174 base::TimeTicks popup_closed_time_; | 175 base::TimeTicks popup_closed_time_; |
175 | 176 |
176 scoped_ptr<views::InkDropDelegate> ink_drop_delegate_; | 177 scoped_ptr<views::InkDropDelegate> ink_drop_delegate_; |
177 | 178 |
178 base::WeakPtrFactory<ToolbarActionView> weak_factory_; | 179 base::WeakPtrFactory<ToolbarActionView> weak_factory_; |
179 | 180 |
180 DISALLOW_COPY_AND_ASSIGN(ToolbarActionView); | 181 DISALLOW_COPY_AND_ASSIGN(ToolbarActionView); |
181 }; | 182 }; |
182 | 183 |
183 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_ACTION_VIEW_H_ | 184 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_ACTION_VIEW_H_ |
OLD | NEW |