| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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_TOOLBAR_TOOLBAR_ACTIONS_BAR_H_ | 5 #ifndef CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_ACTIONS_BAR_H_ |
| 6 #define CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_ACTIONS_BAR_H_ | 6 #define CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_ACTIONS_BAR_H_ |
| 7 | 7 |
| 8 #include <stddef.h> | 8 #include <stddef.h> |
| 9 | 9 |
| 10 #include <memory> | 10 #include <memory> |
| (...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 244 return popped_out_action_; | 244 return popped_out_action_; |
| 245 } | 245 } |
| 246 bool in_overflow_mode() const { return main_bar_ != nullptr; } | 246 bool in_overflow_mode() const { return main_bar_ != nullptr; } |
| 247 | 247 |
| 248 ToolbarActionsBarDelegate* delegate_for_test() { return delegate_; } | 248 ToolbarActionsBarDelegate* delegate_for_test() { return delegate_; } |
| 249 | 249 |
| 250 // During testing we can disable animations by setting this flag to true, | 250 // During testing we can disable animations by setting this flag to true, |
| 251 // so that the bar resizes instantly, instead of having to poll it while it | 251 // so that the bar resizes instantly, instead of having to poll it while it |
| 252 // animates to open/closed status. | 252 // animates to open/closed status. |
| 253 static bool disable_animations_for_testing_; | 253 static bool disable_animations_for_testing_; |
| 254 static void set_extension_bubble_appearance_wait_time_for_testing( |
| 255 int time_in_seconds); |
| 254 | 256 |
| 255 private: | 257 private: |
| 256 using ToolbarActions = ScopedVector<ToolbarActionViewController>; | 258 using ToolbarActions = ScopedVector<ToolbarActionViewController>; |
| 257 | 259 |
| 258 // ToolbarActionsModel::Observer: | 260 // ToolbarActionsModel::Observer: |
| 259 void OnToolbarActionAdded(const ToolbarActionsModel::ToolbarItem& item, | 261 void OnToolbarActionAdded(const ToolbarActionsModel::ToolbarItem& item, |
| 260 int index) override; | 262 int index) override; |
| 261 void OnToolbarActionRemoved(const std::string& action_id) override; | 263 void OnToolbarActionRemoved(const std::string& action_id) override; |
| 262 void OnToolbarActionMoved(const std::string& action_id, int index) override; | 264 void OnToolbarActionMoved(const std::string& action_id, int index) override; |
| 263 void OnToolbarActionUpdated(const std::string& action_id) override; | 265 void OnToolbarActionUpdated(const std::string& action_id) override; |
| (...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 350 bool is_showing_bubble_; | 352 bool is_showing_bubble_; |
| 351 | 353 |
| 352 base::ObserverList<ToolbarActionsBarObserver> observers_; | 354 base::ObserverList<ToolbarActionsBarObserver> observers_; |
| 353 | 355 |
| 354 base::WeakPtrFactory<ToolbarActionsBar> weak_ptr_factory_; | 356 base::WeakPtrFactory<ToolbarActionsBar> weak_ptr_factory_; |
| 355 | 357 |
| 356 DISALLOW_COPY_AND_ASSIGN(ToolbarActionsBar); | 358 DISALLOW_COPY_AND_ASSIGN(ToolbarActionsBar); |
| 357 }; | 359 }; |
| 358 | 360 |
| 359 #endif // CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_ACTIONS_BAR_H_ | 361 #endif // CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_ACTIONS_BAR_H_ |
| OLD | NEW |