chrome/browser/ui/toolbar/toolbar_actions_model.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/toolbar_actions_model.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. Fixed OSX segfaults. 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/mock_component_toolbar_actions_factory.cc ('k') | chrome/browser/ui/views/media_router/media_router_ui_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 2d2d47924f41eb1425dd7417ee11ec85bae59b8b..2145668a49d95ea615a9e14de921312cfeccb039 100644

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

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

@@ -187,7 +187,7 @@ ToolbarActionsModel::CreateActionForItem(Browser* browser,

case COMPONENT_ACTION: {

DCHECK(use_redesign_);

result = ComponentToolbarActionsFactory::GetInstance()

- ->GetComponentToolbarActionForId(item.id, browser)

+ ->GetComponentToolbarActionForId(item.id, browser, bar)

.Pass();

break;

}