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

Unified Diff: chrome/browser/ui/browser_commands.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
Index: chrome/browser/ui/browser_commands.cc
diff --git a/chrome/browser/ui/browser_commands.cc b/chrome/browser/ui/browser_commands.cc
index f62796dec9f233d175f6a6b6d4e13c210f39521f..876bb58b4bc771d7d87768f6bf407881530b42ba 100644
--- a/chrome/browser/ui/browser_commands.cc
+++ b/chrome/browser/ui/browser_commands.cc
@@ -17,7 +17,6 @@
#include "chrome/browser/devtools/devtools_window.h"
#include "chrome/browser/dom_distiller/tab_utils.h"
#include "chrome/browser/lifetime/application_lifetime.h"
-#include "chrome/browser/media/router/media_router_dialog_controller.h"
#include "chrome/browser/platform_util.h"
#include "chrome/browser/prefs/incognito_mode_prefs.h"
#include "chrome/browser/profiles/profile.h"
@@ -111,6 +110,11 @@
#include "components/rlz/rlz_tracker.h"
#endif
+#if defined(ENABLE_MEDIA_ROUTER)
+#include "chrome/browser/media/router/media_router_dialog_controller.h"
+#include "chrome/browser/media/router/media_router_feature.h"
+#endif
+
namespace {
const char kOsOverrideForTabletSite[] = "Linux; Android 4.0.3";
}
@@ -916,9 +920,12 @@ bool CanBasicPrint(Browser* browser) {
}
#endif // ENABLE_BASIC_PRINTING
+#if defined(ENABLE_MEDIA_ROUTER)
bool CanRouteMedia(Browser* browser) {
- if (!switches::MediaRouterEnabled() || browser->profile()->IsOffTheRecord())
+ if (!media_router::MediaRouterEnabled() ||
+ browser->profile()->IsOffTheRecord()) {
return false;
+ }
// Do not allow user to open Media Router dialog when there is already an
// active modal dialog. This avoids overlapping dialogs.
@@ -936,6 +943,7 @@ void RouteMedia(Browser* browser) {
dialog_controller->ShowMediaRouterDialog();
}
+#endif // defined(ENABLE_MEDIA_ROUTER)
void EmailPageLocation(Browser* browser) {
content::RecordAction(UserMetricsAction("EmailPageLocation"));

Powered by Google App Engine
This is Rietveld 408576698