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

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

Issue 547303003: Keep reference view pressed while extension actions have a popup (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: VIEWS_EXPORT fix 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 229 matching lines...) Expand 10 before | Expand all | Expand 10 after
240 virtual void AnimationEnded(const gfx::Animation* animation) OVERRIDE; 240 virtual void AnimationEnded(const gfx::Animation* animation) OVERRIDE;
241 241
242 // Overridden from BrowserActionOverflowMenuController::Observer: 242 // Overridden from BrowserActionOverflowMenuController::Observer:
243 virtual void NotifyMenuDeleted( 243 virtual void NotifyMenuDeleted(
244 BrowserActionOverflowMenuController* controller) OVERRIDE; 244 BrowserActionOverflowMenuController* controller) OVERRIDE;
245 245
246 // Overridden from BrowserActionView::Delegate: 246 // Overridden from BrowserActionView::Delegate:
247 virtual content::WebContents* GetCurrentWebContents() OVERRIDE; 247 virtual content::WebContents* GetCurrentWebContents() OVERRIDE;
248 virtual bool ShownInsideMenu() const OVERRIDE; 248 virtual bool ShownInsideMenu() const OVERRIDE;
249 virtual void OnBrowserActionViewDragDone() OVERRIDE; 249 virtual void OnBrowserActionViewDragDone() OVERRIDE;
250 virtual views::View* GetOverflowReferenceView() OVERRIDE; 250 virtual views::MenuButton* GetOverflowReferenceView() OVERRIDE;
251 virtual void SetPopupOwner(BrowserActionView* popup_owner) OVERRIDE; 251 virtual void SetPopupOwner(BrowserActionView* popup_owner) OVERRIDE;
252 virtual void HideActivePopup() OVERRIDE; 252 virtual void HideActivePopup() OVERRIDE;
253 virtual BrowserActionView* GetMainViewForExtension( 253 virtual BrowserActionView* GetMainViewForExtension(
254 const extensions::Extension* extension) OVERRIDE; 254 const extensions::Extension* extension) OVERRIDE;
255 255
256 // Overridden from extension::ExtensionKeybindingRegistry::Delegate: 256 // Overridden from extension::ExtensionKeybindingRegistry::Delegate:
257 virtual extensions::ActiveTabPermissionGranter* 257 virtual extensions::ActiveTabPermissionGranter*
258 GetActiveTabPermissionGranter() OVERRIDE; 258 GetActiveTabPermissionGranter() OVERRIDE;
259 259
260 // Retrieve the current popup. This should only be used by unit tests. 260 // Retrieve the current popup. This should only be used by unit tests.
(...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after
435 // icons in the application menu). 435 // icons in the application menu).
436 static int icons_per_overflow_menu_row_; 436 static int icons_per_overflow_menu_row_;
437 437
438 // Handles delayed showing of the overflow menu when hovering. 438 // Handles delayed showing of the overflow menu when hovering.
439 base::WeakPtrFactory<BrowserActionsContainer> show_menu_task_factory_; 439 base::WeakPtrFactory<BrowserActionsContainer> show_menu_task_factory_;
440 440
441 DISALLOW_COPY_AND_ASSIGN(BrowserActionsContainer); 441 DISALLOW_COPY_AND_ASSIGN(BrowserActionsContainer);
442 }; 442 };
443 443
444 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_BROWSER_ACTIONS_CONTAINER_H_ 444 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_BROWSER_ACTIONS_CONTAINER_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/toolbar/browser_action_view.cc ('k') | chrome/browser/ui/views/toolbar/browser_actions_container.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698