chrome/browser/ui/toolbar/component_toolbar_actions_factory.h - Issue 1228223002: Close wrench menu when Media Router Action clicked in Views.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/toolbar/component_toolbar_actions_factory.h

Issue 1228223002: Close wrench menu when Media Router Action clicked in Views. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Changes per rdevlin.cronin@'s comments and rebase. Created 5 years, 5 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/toolbar/component_toolbar_actions_browsertest.cc ('k') | chrome/browser/ui/toolbar/component_toolbar_actions_factory.cc » ('j') | chrome/browser/ui/toolbar/media_router_action_platform_delegate.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/toolbar/component_toolbar_actions_factory.h

diff --git a/chrome/browser/ui/toolbar/component_toolbar_actions_factory.h b/chrome/browser/ui/toolbar/component_toolbar_actions_factory.h

index 7ef07133080ece410536e6c76c5869abab480acd..e616eacd8a0c42ff9e3fdd1ff3d4d78fe6846a2c 100644

--- a/chrome/browser/ui/toolbar/component_toolbar_actions_factory.h

+++ b/chrome/browser/ui/toolbar/component_toolbar_actions_factory.h

@@ -7,6 +7,7 @@

#include "base/macros.h"

#include "base/memory/scoped_vector.h"

+#include "chrome/browser/ui/browser.h"

Devlin 2015/07/14 21:31:07 Again, forward declaration will do.

apacible 2015/07/16 16:52:11 Done.

class Profile;

class ToolbarActionViewController;

@@ -24,10 +25,10 @@ class ComponentToolbarActionsFactory {

// Returns a collection of controllers for Chrome Actions. Declared virtual

// for testing.

virtual ScopedVector<ToolbarActionViewController>

- GetComponentToolbarActions();

+ GetComponentToolbarActions(Browser* browser);

// Returns the number of component actions.

- int GetNumComponentActions();

+ int GetNumComponentActions(Browser* browser);

// Sets the factory to use for testing purposes.

// Ownership remains with the caller.