| 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 "chrome/browser/ui/views/toolbar/toolbar_action_view_delegate_views.h" | 9 #include "chrome/browser/ui/views/toolbar/toolbar_action_view_delegate_views.h" |
| 10 #include "content/public/browser/notification_observer.h" | 10 #include "content/public/browser/notification_observer.h" |
| (...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 176 | 176 |
| 177 // If non-null, this is the next toolbar action context menu that wants to run | 177 // If non-null, this is the next toolbar action context menu that wants to run |
| 178 // once the current owner (this one) is done. | 178 // once the current owner (this one) is done. |
| 179 base::Closure followup_context_menu_task_; | 179 base::Closure followup_context_menu_task_; |
| 180 | 180 |
| 181 // The time the popup was last closed. | 181 // The time the popup was last closed. |
| 182 base::TimeTicks popup_closed_time_; | 182 base::TimeTicks popup_closed_time_; |
| 183 | 183 |
| 184 content::NotificationRegistrar registrar_; | 184 content::NotificationRegistrar registrar_; |
| 185 | 185 |
| 186 scoped_ptr<views::InkDropDelegate> ink_drop_delegate_; |
| 187 |
| 186 base::WeakPtrFactory<ToolbarActionView> weak_factory_; | 188 base::WeakPtrFactory<ToolbarActionView> weak_factory_; |
| 187 | 189 |
| 188 DISALLOW_COPY_AND_ASSIGN(ToolbarActionView); | 190 DISALLOW_COPY_AND_ASSIGN(ToolbarActionView); |
| 189 }; | 191 }; |
| 190 | 192 |
| 191 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_ACTION_VIEW_H_ | 193 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_ACTION_VIEW_H_ |
| OLD | NEW |