chrome/browser/ui/toolbar/toolbar_actions_bar.cc - 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/toolbar_actions_bar.cc

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

« chrome/browser/ui/toolbar/media_router_action_platform_delegate.h ('K') | « chrome/browser/ui/toolbar/media_router_action_platform_delegate.h ('k') | chrome/browser/ui/toolbar/wrench_menu_model.cc » ('j') | chrome/browser/ui/views/media_router/media_router_ui_browsertest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 849d2d2be335fca0ee495eca4184e82cbf6d25ca..31600f6974fe2f5f51648ce5fd554cd2bec938fc 100644

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

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

@@ -269,7 +269,7 @@ size_t ToolbarActionsBar::GetIconCount() const {

int num_component_actions =

ComponentToolbarActionsFactory::GetInstance()->

- GetNumComponentActions();

+ GetNumComponentActions(browser_);

size_t num_total_actions = num_extension_actions + num_component_actions;

DCHECK_LE(visible_icons, num_total_actions);

@@ -342,7 +342,7 @@ void ToolbarActionsBar::CreateActions() {

ScopedVector<ToolbarActionViewController> component_actions =

ComponentToolbarActionsFactory::GetInstance()->

- GetComponentToolbarActions();

+ GetComponentToolbarActions(browser_);

DCHECK(component_actions.empty() ||

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

toolbar_actions_.insert(toolbar_actions_.end(),