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

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

Issue 550313002: Pop extensions out of the action overflow menu (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 210 matching lines...) Expand 10 before | Expand all | Expand 10 after
221 // Overridden from views::ResizeAreaDelegate: 221 // Overridden from views::ResizeAreaDelegate:
222 virtual void OnResize(int resize_amount, bool done_resizing) OVERRIDE; 222 virtual void OnResize(int resize_amount, bool done_resizing) OVERRIDE;
223 223
224 // Overridden from gfx::AnimationDelegate: 224 // Overridden from gfx::AnimationDelegate:
225 virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE; 225 virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE;
226 virtual void AnimationEnded(const gfx::Animation* animation) OVERRIDE; 226 virtual void AnimationEnded(const gfx::Animation* animation) OVERRIDE;
227 227
228 // Overridden from BrowserActionOverflowMenuController::Observer: 228 // Overridden from BrowserActionOverflowMenuController::Observer:
229 virtual void NotifyMenuDeleted( 229 virtual void NotifyMenuDeleted(
230 BrowserActionOverflowMenuController* controller) OVERRIDE; 230 BrowserActionOverflowMenuController* controller) OVERRIDE;
231 virtual void NotifyActionMovedToOverflow() OVERRIDE;
231 232
232 // Overridden from BrowserActionView::Delegate: 233 // Overridden from BrowserActionView::Delegate:
233 virtual content::WebContents* GetCurrentWebContents() OVERRIDE; 234 virtual content::WebContents* GetCurrentWebContents() OVERRIDE;
234 virtual bool ShownInsideMenu() const OVERRIDE; 235 virtual bool ShownInsideMenu() const OVERRIDE;
235 virtual void OnBrowserActionViewDragDone() OVERRIDE; 236 virtual void OnBrowserActionViewDragDone() OVERRIDE;
236 virtual views::View* GetOverflowReferenceView() OVERRIDE; 237 virtual views::View* GetOverflowReferenceView() OVERRIDE;
237 virtual void SetPopupOwner(BrowserActionView* popup_owner) OVERRIDE; 238 virtual void SetPopupOwner(BrowserActionView* popup_owner) OVERRIDE;
238 virtual void HideActivePopup() OVERRIDE; 239 virtual void HideActivePopup() OVERRIDE;
239 240
240 // Overridden from extension::ExtensionKeybindingRegistry::Delegate: 241 // Overridden from extension::ExtensionKeybindingRegistry::Delegate:
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
417 418
418 // Handles delayed showing of the overflow menu when hovering. 419 // Handles delayed showing of the overflow menu when hovering.
419 base::WeakPtrFactory<BrowserActionsContainer> show_menu_task_factory_; 420 base::WeakPtrFactory<BrowserActionsContainer> show_menu_task_factory_;
420 421
421 ObserverList<BrowserActionsContainerObserver> observers_; 422 ObserverList<BrowserActionsContainerObserver> observers_;
422 423
423 DISALLOW_COPY_AND_ASSIGN(BrowserActionsContainer); 424 DISALLOW_COPY_AND_ASSIGN(BrowserActionsContainer);
424 }; 425 };
425 426
426 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_BROWSER_ACTIONS_CONTAINER_H_ 427 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_BROWSER_ACTIONS_CONTAINER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698