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

Unified Diff: chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.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
« no previous file with comments | « chrome/browser/prefs/pref_service_syncable_util.cc ('k') | chrome/browser/profiles/profile.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
index 539c6d2ab1f927e28e9ae85b52c046fac83e8769..3da1dfdf845703e9b188600349d4b5e68c23c763 100644
--- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
+++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
@@ -28,6 +28,7 @@
#include "chrome/browser/google/google_url_tracker_factory.h"
#include "chrome/browser/history/history_service_factory.h"
#include "chrome/browser/invalidation/profile_invalidation_provider_factory.h"
+#include "chrome/browser/media/router/media_router_factory.h"
#include "chrome/browser/media_galleries/media_galleries_preferences_factory.h"
#include "chrome/browser/net/nqe/ui_network_quality_estimator_service_factory.h"
#include "chrome/browser/notifications/extension_welcome_notification_factory.h"
@@ -126,6 +127,7 @@
#include "chrome/browser/android/search_geolocation/search_geolocation_service.h"
#else
#include "chrome/browser/cryptauth/chrome_cryptauth_service_factory.h"
+#include "chrome/browser/media/router/media_router_ui_service_factory.h"
#include "chrome/browser/ui/global_error/global_error_service_factory.h"
#include "chrome/browser/usb/usb_chooser_context_factory.h"
#endif
@@ -143,13 +145,6 @@
#include "chrome/browser/printing/cloud_print/privet_notifications_factory.h"
#endif
-#if defined(ENABLE_MEDIA_ROUTER)
-#include "chrome/browser/media/router/media_router_factory.h"
-#if !defined(OS_ANDROID)
-#include "chrome/browser/media/router/media_router_ui_service_factory.h"
-#endif
-#endif
-
namespace chrome {
void AddProfilesExtraParts(ChromeBrowserMainParts* main_parts) {
@@ -273,12 +268,10 @@ EnsureBrowserContextKeyedServiceFactoriesBuilt() {
->SetUIDelegateFactory(std::move(networking_private_ui_delegate_factory));
#endif
#endif
-#if defined(ENABLE_MEDIA_ROUTER)
media_router::MediaRouterFactory::GetInstance();
#if !defined(OS_ANDROID)
media_router::MediaRouterUIServiceFactory::GetInstance();
#endif
-#endif // defined(ENABLE_MEDIA_ROUTER)
#if !defined(OS_ANDROID)
MediaGalleriesPreferencesFactory::GetInstance();
NTPResourceCacheFactory::GetInstance();
« no previous file with comments | « chrome/browser/prefs/pref_service_syncable_util.cc ('k') | chrome/browser/profiles/profile.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698