| 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_BROWSER_ACTIONS_CONTAINER_H_ | 5 #ifndef CHROME_BROWSER_UI_VIEWS_TOOLBAR_BROWSER_ACTIONS_CONTAINER_H_ |
| 6 #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_BROWSER_ACTIONS_CONTAINER_H_ | 6 #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_BROWSER_ACTIONS_CONTAINER_H_ |
| 7 | 7 |
| 8 #include "base/observer_list.h" | 8 #include "base/observer_list.h" |
| 9 #include "chrome/browser/extensions/extension_keybinding_registry.h" | 9 #include "chrome/browser/extensions/extension_keybinding_registry.h" |
| 10 #include "chrome/browser/ui/toolbar/toolbar_actions_bar.h" | 10 #include "chrome/browser/ui/toolbar/toolbar_actions_bar.h" |
| (...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 248 int GetChevronWidth() const override; | 248 int GetChevronWidth() const override; |
| 249 bool IsPopupRunning() const override; | 249 bool IsPopupRunning() const override; |
| 250 | 250 |
| 251 // Overridden from extension::ExtensionKeybindingRegistry::Delegate: | 251 // Overridden from extension::ExtensionKeybindingRegistry::Delegate: |
| 252 extensions::ActiveTabPermissionGranter* GetActiveTabPermissionGranter() | 252 extensions::ActiveTabPermissionGranter* GetActiveTabPermissionGranter() |
| 253 override; | 253 override; |
| 254 | 254 |
| 255 // Retrieve the current popup. This should only be used by unit tests. | 255 // Retrieve the current popup. This should only be used by unit tests. |
| 256 gfx::NativeView TestGetPopup(); | 256 gfx::NativeView TestGetPopup(); |
| 257 | 257 |
| 258 // During testing we can disable animations by setting this flag to true, | |
| 259 // so that the bar resizes instantly, instead of having to poll it while it | |
| 260 // animates to open/closed status. | |
| 261 static bool disable_animations_during_testing_; | |
| 262 | |
| 263 protected: | 258 protected: |
| 264 // Overridden from views::View: | 259 // Overridden from views::View: |
| 265 void ViewHierarchyChanged( | 260 void ViewHierarchyChanged( |
| 266 const ViewHierarchyChangedDetails& details) override; | 261 const ViewHierarchyChangedDetails& details) override; |
| 267 void OnPaint(gfx::Canvas* canvas) override; | 262 void OnPaint(gfx::Canvas* canvas) override; |
| 268 void OnThemeChanged() override; | 263 void OnThemeChanged() override; |
| 269 | 264 |
| 270 private: | 265 private: |
| 271 // A struct representing the position at which an action will be dropped. | 266 // A struct representing the position at which an action will be dropped. |
| 272 struct DropPosition; | 267 struct DropPosition; |
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 338 | 333 |
| 339 // The class that registers for keyboard shortcuts for extension commands. | 334 // The class that registers for keyboard shortcuts for extension commands. |
| 340 scoped_ptr<ExtensionKeybindingRegistryViews> extension_keybinding_registry_; | 335 scoped_ptr<ExtensionKeybindingRegistryViews> extension_keybinding_registry_; |
| 341 | 336 |
| 342 ObserverList<BrowserActionsContainerObserver> observers_; | 337 ObserverList<BrowserActionsContainerObserver> observers_; |
| 343 | 338 |
| 344 DISALLOW_COPY_AND_ASSIGN(BrowserActionsContainer); | 339 DISALLOW_COPY_AND_ASSIGN(BrowserActionsContainer); |
| 345 }; | 340 }; |
| 346 | 341 |
| 347 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_BROWSER_ACTIONS_CONTAINER_H_ | 342 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_BROWSER_ACTIONS_CONTAINER_H_ |
| OLD | NEW |