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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/webui/chrome_web_ui_controller_factory.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
« chrome/browser/ui/toolbar/wrench_menu_model.cc ('K') | « chrome/browser/ui/toolbar/wrench_menu_model.cc ('k') | chrome/browser/ui/webui/media_router/media_router_dialog_controller_impl_browsertest.cc » ('j') | chrome/browser/ui/webui/media_router/media_router_test.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
index c7a3e9e7c62ec2fa75016a014dd1a0f00a518a81..f049f6d86628428544662156d9d8aaeeb22c8996 100644
--- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
+++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
@@ -93,6 +93,7 @@
#endif
#if defined(ENABLE_MEDIA_ROUTER) && !defined(OS_ANDROID)
+#include "chrome/browser/media/router/media_router_feature.h"
#include "chrome/browser/ui/webui/media_router/media_router_ui.h"
#endif
@@ -583,7 +584,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
#endif
#if defined(ENABLE_MEDIA_ROUTER) && !defined(OS_ANDROID)
if (url.host() == chrome::kChromeUIMediaRouterHost &&
- switches::MediaRouterEnabled()) {
+ media_router::MediaRouterEnabled()) {
return &NewWebUI<media_router::MediaRouterUI>;
}
#endif
« chrome/browser/ui/toolbar/wrench_menu_model.cc ('K') | « chrome/browser/ui/toolbar/wrench_menu_model.cc ('k') | chrome/browser/ui/webui/media_router/media_router_dialog_controller_impl_browsertest.cc » ('j') | chrome/browser/ui/webui/media_router/media_router_test.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698