| 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();
|
|
|