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

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. 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
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 956c3cb7a25b5e0c072c8a5bdba7482b54dbe2e0..e9eda34fccf3429a9a0ae25082ba39696c3975f3 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::GetInitialComponentIds(
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();
« no previous file with comments | « chrome/browser/ui/toolbar/component_toolbar_actions_factory.h ('k') | chrome/browser/ui/toolbar/media_router_action.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698