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

Unified Diff: chrome/browser/extensions/chrome_mojo_service_registration.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/chrome_mojo_service_registration.cc
diff --git a/chrome/browser/extensions/chrome_mojo_service_registration.cc b/chrome/browser/extensions/chrome_mojo_service_registration.cc
index 0e35f1eaefad48265db04bba8243aa8782e088ea..cfc07076c7b32c310a5582c14671a085ca0139d1 100644
--- a/chrome/browser/extensions/chrome_mojo_service_registration.cc
+++ b/chrome/browser/extensions/chrome_mojo_service_registration.cc
@@ -6,6 +6,8 @@
#include "base/bind.h"
#include "base/logging.h"
+#include "chrome/browser/media/router/media_router_feature.h" // nogncheck
+#include "chrome/browser/media/router/mojo/media_router_mojo_impl.h" // nogncheck
#include "content/public/browser/render_frame_host.h"
#include "content/public/browser/render_process_host.h"
#include "extensions/common/extension.h"
@@ -13,11 +15,6 @@
#include "extensions/common/permissions/permissions_data.h"
#include "services/service_manager/public/cpp/interface_registry.h"
-#if defined(ENABLE_MEDIA_ROUTER)
-#include "chrome/browser/media/router/media_router_feature.h" // nogncheck
-#include "chrome/browser/media/router/mojo/media_router_mojo_impl.h" // nogncheck
-#endif
-
namespace extensions {
void RegisterChromeServicesForFrame(content::RenderFrameHost* render_frame_host,
@@ -25,7 +22,6 @@ void RegisterChromeServicesForFrame(content::RenderFrameHost* render_frame_host,
DCHECK(render_frame_host);
DCHECK(extension);
-#if defined(ENABLE_MEDIA_ROUTER)
content::BrowserContext* context =
render_frame_host->GetProcess()->GetBrowserContext();
if (media_router::MediaRouterEnabled(context)) {
@@ -36,7 +32,6 @@ void RegisterChromeServicesForFrame(content::RenderFrameHost* render_frame_host,
extension, context));
}
}
-#endif // defined(ENABLE_MEDIA_ROUTER)
}
} // namespace extensions

Powered by Google App Engine
This is Rietveld 408576698