| 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 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 140 // opened. | 140 // opened. |
| 141 // Returns true if a menu was closed, false otherwise. | 141 // Returns true if a menu was closed, false otherwise. |
| 142 bool CloseActiveMenuIfNeeded(); | 142 bool CloseActiveMenuIfNeeded(); |
| 143 | 143 |
| 144 // A lock to keep the MenuButton pressed when a menu or popup is visible. | 144 // A lock to keep the MenuButton pressed when a menu or popup is visible. |
| 145 scoped_ptr<views::MenuButton::PressedLock> pressed_lock_; | 145 scoped_ptr<views::MenuButton::PressedLock> pressed_lock_; |
| 146 | 146 |
| 147 // The controller for this toolbar action view. | 147 // The controller for this toolbar action view. |
| 148 ToolbarActionViewController* view_controller_; | 148 ToolbarActionViewController* view_controller_; |
| 149 | 149 |
| 150 // The associated profile. | |
| 151 Profile* profile_; | |
| 152 | |
| 153 // Delegate that usually represents a container for ToolbarActionView. | 150 // Delegate that usually represents a container for ToolbarActionView. |
| 154 Delegate* delegate_; | 151 Delegate* delegate_; |
| 155 | 152 |
| 156 // Used to make sure we only register the command once. | 153 // Used to make sure we only register the command once. |
| 157 bool called_register_command_; | 154 bool called_register_command_; |
| 158 | 155 |
| 159 // The cached value of whether or not the action wants to run on the current | 156 // The cached value of whether or not the action wants to run on the current |
| 160 // tab. | 157 // tab. |
| 161 bool wants_to_run_; | 158 bool wants_to_run_; |
| 162 | 159 |
| (...skipping 12 matching lines...) Expand all Loading... |
| 175 base::TimeTicks popup_closed_time_; | 172 base::TimeTicks popup_closed_time_; |
| 176 | 173 |
| 177 scoped_ptr<views::InkDropDelegate> ink_drop_delegate_; | 174 scoped_ptr<views::InkDropDelegate> ink_drop_delegate_; |
| 178 | 175 |
| 179 base::WeakPtrFactory<ToolbarActionView> weak_factory_; | 176 base::WeakPtrFactory<ToolbarActionView> weak_factory_; |
| 180 | 177 |
| 181 DISALLOW_COPY_AND_ASSIGN(ToolbarActionView); | 178 DISALLOW_COPY_AND_ASSIGN(ToolbarActionView); |
| 182 }; | 179 }; |
| 183 | 180 |
| 184 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_ACTION_VIEW_H_ | 181 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_ACTION_VIEW_H_ |
| OLD | NEW |