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

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

Issue 2760403003: Remove enable_media_router. (Closed)
Patch Set: . Created 3 years, 8 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 50feb8c3058a40e4015954dfed01c2963703396e..1686fd3761a5f9459ae62ea57f43fe2f4feed1db 100644
--- a/chrome/browser/extensions/external_component_loader.cc
+++ b/chrome/browser/extensions/external_component_loader.cc
@@ -8,6 +8,7 @@
#include "build/build_config.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/extensions/component_extensions_whitelist/whitelist.h"
+#include "chrome/browser/media/router/media_router_feature.h"
#include "chrome/browser/search/hotword_service.h"
#include "chrome/browser/search/hotword_service_factory.h"
#include "chrome/browser/signin/signin_manager_factory.h"
@@ -27,10 +28,6 @@
#include "chrome/browser/ui/app_list/google_now_extension.h"
#endif
-#if defined(ENABLE_MEDIA_ROUTER)
-#include "chrome/browser/media/router/media_router_feature.h"
-#endif
-
namespace extensions {
ExternalComponentLoader::ExternalComponentLoader(Profile* profile)
@@ -57,12 +54,10 @@ void ExternalComponentLoader::StartLoading() {
}
#endif
-#if defined(ENABLE_MEDIA_ROUTER)
if (media_router::MediaRouterEnabled(profile_) &&
FeatureSwitch::load_media_router_component_extension()->IsEnabled()) {
AddExternalExtension(extension_misc::kMediaRouterStableExtensionId);
}
-#endif // defined(ENABLE_MEDIA_ROUTER)
#if BUILDFLAG(ENABLE_APP_LIST) && defined(OS_CHROMEOS)
std::string google_now_extension_id;

Powered by Google App Engine
This is Rietveld 408576698