| 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/extensions/extension_toolbar_model.h" | 10 #include "chrome/browser/extensions/extension_toolbar_model.h" |
| (...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 238 | 238 |
| 239 // Overridden from views::WidgetObserver: | 239 // Overridden from views::WidgetObserver: |
| 240 virtual void OnWidgetDestroying(views::Widget* widget) OVERRIDE; | 240 virtual void OnWidgetDestroying(views::Widget* widget) OVERRIDE; |
| 241 | 241 |
| 242 // Overridden from BrowserActionView::Delegate: | 242 // Overridden from BrowserActionView::Delegate: |
| 243 virtual void InspectPopup(ExtensionAction* action) OVERRIDE; | 243 virtual void InspectPopup(ExtensionAction* action) OVERRIDE; |
| 244 virtual int GetCurrentTabId() const OVERRIDE; | 244 virtual int GetCurrentTabId() const OVERRIDE; |
| 245 virtual void OnBrowserActionExecuted(BrowserActionButton* button) OVERRIDE; | 245 virtual void OnBrowserActionExecuted(BrowserActionButton* button) OVERRIDE; |
| 246 virtual void OnBrowserActionVisibilityChanged() OVERRIDE; | 246 virtual void OnBrowserActionVisibilityChanged() OVERRIDE; |
| 247 virtual bool ShownInsideMenu() const OVERRIDE; | 247 virtual bool ShownInsideMenu() const OVERRIDE; |
| 248 virtual void OnBrowserActionViewDragDone() OVERRIDE; | |
| 249 | 248 |
| 250 // Overridden from extension::ExtensionKeybindingRegistry::Delegate: | 249 // Overridden from extension::ExtensionKeybindingRegistry::Delegate: |
| 251 virtual extensions::ActiveTabPermissionGranter* | 250 virtual extensions::ActiveTabPermissionGranter* |
| 252 GetActiveTabPermissionGranter() OVERRIDE; | 251 GetActiveTabPermissionGranter() OVERRIDE; |
| 253 | 252 |
| 254 // Moves a browser action with |id| to |new_index|. | 253 // Moves a browser action with |id| to |new_index|. |
| 255 void MoveBrowserAction(const std::string& extension_id, size_t new_index); | 254 void MoveBrowserAction(const std::string& extension_id, size_t new_index); |
| 256 | 255 |
| 257 // Shows the popup for |extension| if possible. Returns true if a new popup | 256 // Shows the popup for |extension| if possible. Returns true if a new popup |
| 258 // was shown. Showing the popup will grant tab permissions if | 257 // was shown. Showing the popup will grant tab permissions if |
| (...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 441 | 440 |
| 442 // Handles delayed showing of the overflow menu when hovering. | 441 // Handles delayed showing of the overflow menu when hovering. |
| 443 base::WeakPtrFactory<BrowserActionsContainer> show_menu_task_factory_; | 442 base::WeakPtrFactory<BrowserActionsContainer> show_menu_task_factory_; |
| 444 | 443 |
| 445 ObserverList<BrowserActionsContainerObserver> observers_; | 444 ObserverList<BrowserActionsContainerObserver> observers_; |
| 446 | 445 |
| 447 DISALLOW_COPY_AND_ASSIGN(BrowserActionsContainer); | 446 DISALLOW_COPY_AND_ASSIGN(BrowserActionsContainer); |
| 448 }; | 447 }; |
| 449 | 448 |
| 450 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_BROWSER_ACTIONS_CONTAINER_H_ | 449 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_BROWSER_ACTIONS_CONTAINER_H_ |
| OLD | NEW |