Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(103)

Side by Side Diff: chrome/browser/ui/views/toolbar/browser_actions_container.h

Issue 561023002: Use the wrench menu as a reference view for overflowed extension actions' popups (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 218 matching lines...) Expand 10 before | Expand all | Expand 10 after
229 virtual void NotifyMenuDeleted( 229 virtual void NotifyMenuDeleted(
230 BrowserActionOverflowMenuController* controller) OVERRIDE; 230 BrowserActionOverflowMenuController* controller) OVERRIDE;
231 231
232 // Overridden from BrowserActionView::Delegate: 232 // Overridden from BrowserActionView::Delegate:
233 virtual content::WebContents* GetCurrentWebContents() OVERRIDE; 233 virtual content::WebContents* GetCurrentWebContents() OVERRIDE;
234 virtual bool ShownInsideMenu() const OVERRIDE; 234 virtual bool ShownInsideMenu() const OVERRIDE;
235 virtual void OnBrowserActionViewDragDone() OVERRIDE; 235 virtual void OnBrowserActionViewDragDone() OVERRIDE;
236 virtual views::View* GetOverflowReferenceView() OVERRIDE; 236 virtual views::View* GetOverflowReferenceView() OVERRIDE;
237 virtual void SetPopupOwner(BrowserActionView* popup_owner) OVERRIDE; 237 virtual void SetPopupOwner(BrowserActionView* popup_owner) OVERRIDE;
238 virtual void HideActivePopup() OVERRIDE; 238 virtual void HideActivePopup() OVERRIDE;
239 virtual BrowserActionView* GetMainViewForExtension(
240 const extensions::Extension* extension) OVERRIDE;
239 241
240 // Overridden from extension::ExtensionKeybindingRegistry::Delegate: 242 // Overridden from extension::ExtensionKeybindingRegistry::Delegate:
241 virtual extensions::ActiveTabPermissionGranter* 243 virtual extensions::ActiveTabPermissionGranter*
242 GetActiveTabPermissionGranter() OVERRIDE; 244 GetActiveTabPermissionGranter() OVERRIDE;
243 245
244 // Retrieve the current popup. This should only be used by unit tests. 246 // Retrieve the current popup. This should only be used by unit tests.
245 ExtensionPopup* TestGetPopup(); 247 ExtensionPopup* TestGetPopup();
246 248
247 // Set how many icons the container should show. This should only be used by 249 // Set how many icons the container should show. This should only be used by
248 // unit tests. 250 // unit tests.
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
417 419
418 // Handles delayed showing of the overflow menu when hovering. 420 // Handles delayed showing of the overflow menu when hovering.
419 base::WeakPtrFactory<BrowserActionsContainer> show_menu_task_factory_; 421 base::WeakPtrFactory<BrowserActionsContainer> show_menu_task_factory_;
420 422
421 ObserverList<BrowserActionsContainerObserver> observers_; 423 ObserverList<BrowserActionsContainerObserver> observers_;
422 424
423 DISALLOW_COPY_AND_ASSIGN(BrowserActionsContainer); 425 DISALLOW_COPY_AND_ASSIGN(BrowserActionsContainer);
424 }; 426 };
425 427
426 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_BROWSER_ACTIONS_CONTAINER_H_ 428 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_BROWSER_ACTIONS_CONTAINER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698