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

Unified Diff: chrome/browser/extensions/external_component_loader.cc

Issue 1415333002: [Media Router] Add experiment control logic. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase 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/extensions/external_component_loader.cc
diff --git a/chrome/browser/extensions/external_component_loader.cc b/chrome/browser/extensions/external_component_loader.cc
index 8bace512e06e1e3b2d79163c4868d3d677c276ed..736c491972ec9ffbbc29737064559caa8464c342 100644
--- a/chrome/browser/extensions/external_component_loader.cc
+++ b/chrome/browser/extensions/external_component_loader.cc
@@ -10,7 +10,6 @@
#include "chrome/browser/search/hotword_service.h"
#include "chrome/browser/search/hotword_service_factory.h"
#include "chrome/browser/signin/signin_manager_factory.h"
-#include "chrome/common/chrome_switches.h"
#include "chrome/common/extensions/extension_constants.h"
#include "components/signin/core/browser/signin_manager.h"
#include "extensions/common/extension_urls.h"
@@ -25,6 +24,10 @@
#include "chrome/browser/ui/app_list/google_now_extension.h"
#endif
+#if defined(ENABLE_MEDIA_ROUTER) && defined(GOOGLE_CHROME_BUILD)
+#include "chrome/browser/media/router/media_router_feature.h"
+#endif
+
namespace extensions {
ExternalComponentLoader::ExternalComponentLoader(Profile* profile)
@@ -50,7 +53,7 @@ void ExternalComponentLoader::StartLoading() {
#endif
#if defined(ENABLE_MEDIA_ROUTER) && defined(GOOGLE_CHROME_BUILD)
- if (switches::MediaRouterEnabled())
+ if (media_router::MediaRouterEnabled())
AddExternalExtension(extension_misc::kMediaRouterStableExtensionId);
#endif // defined(ENABLE_MEDIA_ROUTER) && defined(GOOGLE_CHROME_BUILD)
« no previous file with comments | « chrome/browser/extensions/chrome_mojo_service_registration.cc ('k') | chrome/browser/media/router/media_router_feature.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698