chrome/browser/ui/toolbar/component_toolbar_actions_factory.cc - Issue 1495653003: [Media Router] Check MediaRouterDialogControllerImpl only sets toolbar MediaRouterAction.

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.cc

Issue 1495653003: [Media Router] Check MediaRouterDialogControllerImpl only sets toolbar MediaRouterAction. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Changes per pkasting@'s comments. Created 5 years 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_factory.h ('k') | chrome/browser/ui/toolbar/media_router_action.h » ('j') | chrome/browser/ui/toolbar/media_router_action.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 0c450600eef95eaefa87d5941c57025b458a89ca..037a85d14191917b675b0f7b9ee877a2fd0fea69 100644

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

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

@@ -55,7 +55,8 @@ std::set<std::string> ComponentToolbarActionsFactory::GetComponentIds(

scoped_ptr<ToolbarActionViewController>

ComponentToolbarActionsFactory::GetComponentToolbarActionForId(

const std::string& id,

- Browser* browser) {

+ Browser* browser,

+ ToolbarActionsBar* bar) {

// This is currently behind the extension-action-redesign flag, as it is

// designed for the new toolbar.

DCHECK(extensions::FeatureSwitch::extension_action_redesign()->IsEnabled());

@@ -70,7 +71,7 @@ ComponentToolbarActionsFactory::GetComponentToolbarActionForId(

#if defined(ENABLE_MEDIA_ROUTER)

if (id == kMediaRouterActionId)

return scoped_ptr<ToolbarActionViewController>(

- new MediaRouterAction(browser));

+ new MediaRouterAction(browser, bar));

#endif // defined(ENABLE_MEDIA_ROUTER)

NOTREACHED();