| 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" |
| (...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 157 // Responsible for running the menu. | 157 // Responsible for running the menu. |
| 158 std::unique_ptr<views::MenuRunner> menu_runner_; | 158 std::unique_ptr<views::MenuRunner> menu_runner_; |
| 159 | 159 |
| 160 // The root MenuItemView for the context menu, or null if no menu is being | 160 // The root MenuItemView for the context menu, or null if no menu is being |
| 161 // shown. | 161 // shown. |
| 162 views::MenuItemView* menu_; | 162 views::MenuItemView* menu_; |
| 163 | 163 |
| 164 // The time the popup was last closed. | 164 // The time the popup was last closed. |
| 165 base::TimeTicks popup_closed_time_; | 165 base::TimeTicks popup_closed_time_; |
| 166 | 166 |
| 167 std::unique_ptr<views::InkDropDelegate> ink_drop_delegate_; | |
| 168 | |
| 169 base::WeakPtrFactory<ToolbarActionView> weak_factory_; | 167 base::WeakPtrFactory<ToolbarActionView> weak_factory_; |
| 170 | 168 |
| 171 DISALLOW_COPY_AND_ASSIGN(ToolbarActionView); | 169 DISALLOW_COPY_AND_ASSIGN(ToolbarActionView); |
| 172 }; | 170 }; |
| 173 | 171 |
| 174 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_ACTION_VIEW_H_ | 172 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_ACTION_VIEW_H_ |
| OLD | NEW |