Chromium Code Reviews| 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 487a59a88d9ba57f538fb13f71c930c0a21db8ee..1f441f799aefe1522a1aec4056f28244e4545a06 100644 |
| --- a/chrome/browser/ui/toolbar/component_toolbar_actions_factory.cc |
| +++ b/chrome/browser/ui/toolbar/component_toolbar_actions_factory.cc |
| @@ -10,6 +10,7 @@ |
| #include "chrome/browser/media/router/media_router_feature.h" |
| #include "chrome/browser/profiles/profile.h" |
| #include "chrome/browser/ui/browser.h" |
| +#include "chrome/browser/ui/toolbar/media_router_action_controller.h" |
| #include "chrome/browser/ui/toolbar/toolbar_action_view_controller.h" |
| #include "extensions/common/feature_switch.h" |
| @@ -44,6 +45,9 @@ ComponentToolbarActionsFactory* ComponentToolbarActionsFactory::GetInstance() { |
| std::set<std::string> ComponentToolbarActionsFactory::GetInitialComponentIds( |
| Profile* profile) { |
| std::set<std::string> component_ids; |
| + if (media_router::MediaRouterEnabled(profile) && |
| + MediaRouterActionController::IsActionShownByPolicy(profile)) |
| + component_ids.insert(kMediaRouterActionId); |
|
imcheng
2016/12/20 19:34:35
nit: blank line before return makes the code more
takumif
2016/12/28 19:55:03
Done.
|
| return component_ids; |
| } |