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

Unified Diff: chrome/browser/ui/browser_commands.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
« no previous file with comments | « chrome/browser/ui/BUILD.gn ('k') | chrome/browser/ui/toolbar/app_menu_model.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/browser_commands.cc
diff --git a/chrome/browser/ui/browser_commands.cc b/chrome/browser/ui/browser_commands.cc
index b2067a1f7064c515e4da477dcf1424365f7ecf18..b1441971172ba60060c8db61087bcd1114c5f461 100644
--- a/chrome/browser/ui/browser_commands.cc
+++ b/chrome/browser/ui/browser_commands.cc
@@ -20,6 +20,7 @@
#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" // nogncheck
#include "chrome/browser/media/router/media_router_feature.h"
#include "chrome/browser/platform_util.h"
#include "chrome/browser/prefs/incognito_mode_prefs.h"
@@ -116,10 +117,6 @@
#include "components/rlz/rlz_tracker.h" // nogncheck
#endif
-#if defined(ENABLE_MEDIA_ROUTER)
-#include "chrome/browser/media/router/media_router_dialog_controller.h" // nogncheck
-#endif
-
namespace {
const char kOsOverrideForTabletSite[] = "Linux; Android 4.0.3";
@@ -963,7 +960,6 @@ bool CanRouteMedia(Browser* browser) {
}
void RouteMedia(Browser* browser) {
-#if defined(ENABLE_MEDIA_ROUTER)
DCHECK(CanRouteMedia(browser));
media_router::MediaRouterDialogController* dialog_controller =
@@ -973,7 +969,6 @@ void RouteMedia(Browser* browser) {
return;
dialog_controller->ShowMediaRouterDialog();
-#endif // defined(ENABLE_MEDIA_ROUTER)
}
void EmailPageLocation(Browser* browser) {
« no previous file with comments | « chrome/browser/ui/BUILD.gn ('k') | chrome/browser/ui/toolbar/app_menu_model.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698