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

Unified Diff: chrome/browser/ui/toolbar/component_toolbar_actions_factory.cc

Issue 1415333002: [Media Router] Add experiment control logic. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed msw@'s comments Created 5 years, 2 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
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 cdde653df7a195b7c119a0dc811fb29a3eab1c9f..5391c459e7e7dcf5c9164f329dfe724d3e8c113e 100644
--- a/chrome/browser/ui/toolbar/component_toolbar_actions_factory.cc
+++ b/chrome/browser/ui/toolbar/component_toolbar_actions_factory.cc
@@ -13,6 +13,10 @@
#include "chrome/common/chrome_switches.h"
#include "extensions/common/feature_switch.h"
+#if defined(ENABLE_MEDIA_ROUTER)
+#include "chrome/browser/media/router/media_router_feature.h"
+#endif
+
namespace {
ComponentToolbarActionsFactory* testing_factory_ = nullptr;
@@ -43,8 +47,10 @@ std::set<std::string> ComponentToolbarActionsFactory::GetComponentIds(
if (!extensions::FeatureSwitch::extension_action_redesign()->IsEnabled())
return component_ids;
- if (switches::MediaRouterEnabled() && !profile->IsOffTheRecord())
+#if defined(ENABLE_MEDIA_ROUTER)
+ if (media_router::MediaRouterEnabled() && !profile->IsOffTheRecord())
component_ids.insert(kMediaRouterActionId);
+#endif // defined(ENABLE_MEDIA_ROUTER)
return component_ids;
}

Powered by Google App Engine
This is Rietveld 408576698