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

Unified Diff: chrome/browser/ui/toolbar/wrench_menu_model.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/toolbar/wrench_menu_model.cc
diff --git a/chrome/browser/ui/toolbar/wrench_menu_model.cc b/chrome/browser/ui/toolbar/wrench_menu_model.cc
index 81eed59c4f6ed576949b1e5c56e7de6d7fe15c3c..1bd6b5ea46e71b6fb6b16a7baffbdec1821d3455 100644
--- a/chrome/browser/ui/toolbar/wrench_menu_model.cc
+++ b/chrome/browser/ui/toolbar/wrench_menu_model.cc
@@ -81,6 +81,10 @@
#include "ash/shell.h"
#endif
+#if defined(ENABLE_MEDIA_ROUTER)
+#include "chrome/browser/media/router/media_router_feature.h"
+#endif
+
using base::UserMetricsAction;
using content::WebContents;
@@ -889,8 +893,11 @@ void WrenchMenuModel::Build() {
CreateZoomMenu();
AddItemWithStringId(IDC_PRINT, IDS_PRINT);
- if (switches::MediaRouterEnabled() && !browser()->profile()->IsOffTheRecord())
+#if defined(ENABLE_MEDIA_ROUTER)
+ if (media_router::MediaRouterEnabled() &&
+ !browser()->profile()->IsOffTheRecord())
msw 2015/10/23 20:18:43 nit: add curly braces
imcheng 2015/10/23 21:39:26 Done.
AddItemWithStringId(IDC_ROUTE_MEDIA, IDS_MEDIA_ROUTER_MENU_ITEM_TITLE);
+#endif
AddItemWithStringId(IDC_FIND, IDS_FIND);
if (base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kEnableDomDistiller))

Powered by Google App Engine
This is Rietveld 408576698