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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1415333002: [Media Router] Add experiment control logic. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
« no previous file with comments | « chrome/browser/chrome_content_browser_client.cc ('k') | chrome/browser/extensions/external_component_loader.cc » ('j') | chrome/browser/extensions/external_component_loader.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 dc6651b0242b06ed490aa02ab8e82d62e59562c9..3c4d7ec00596bfa6a77533aa6bfc820386b24271 100644
--- a/chrome/browser/extensions/chrome_mojo_service_registration.cc
+++ b/chrome/browser/extensions/chrome_mojo_service_registration.cc
@@ -17,6 +17,7 @@
#include "extensions/common/switches.h"
msw 2015/10/23 20:18:42 nit: remove
imcheng 2015/10/23 21:39:26 Done.
#if defined(ENABLE_MEDIA_ROUTER)
+#include "chrome/browser/media/router/media_router_feature.h"
#include "chrome/browser/media/router/media_router_mojo_impl.h"
#endif
@@ -28,8 +29,7 @@ void RegisterChromeServicesForFrame(content::RenderFrameHost* render_frame_host,
DCHECK(extension);
#if defined(ENABLE_MEDIA_ROUTER)
- if (base::CommandLine::ForCurrentProcess()->HasSwitch(
- ::switches::kEnableMediaRouter)) {
+ if (media_router::MediaRouterEnabled()) {
if (extension->permissions_data()->HasAPIPermission(
APIPermission::kMediaRouterPrivate)) {
render_frame_host->GetServiceRegistry()->AddService(base::Bind(
« no previous file with comments | « chrome/browser/chrome_content_browser_client.cc ('k') | chrome/browser/extensions/external_component_loader.cc » ('j') | chrome/browser/extensions/external_component_loader.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698