| Index: chrome/browser/ui/browser_commands.cc
|
| diff --git a/chrome/browser/ui/browser_commands.cc b/chrome/browser/ui/browser_commands.cc
|
| index 047155e328c85d54cfb9e9915b3d8a555a9470ca..12f21b3084b62654b2367e199b06eecc95a17cfc 100644
|
| --- a/chrome/browser/ui/browser_commands.cc
|
| +++ b/chrome/browser/ui/browser_commands.cc
|
| @@ -17,7 +17,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"
|
| +#include "chrome/browser/media/router/media_router_feature.h"
|
| #include "chrome/browser/platform_util.h"
|
| #include "chrome/browser/prefs/incognito_mode_prefs.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| @@ -51,7 +51,6 @@
|
| #include "chrome/browser/ui/tab_dialogs.h"
|
| #include "chrome/browser/ui/tabs/tab_strip_model.h"
|
| #include "chrome/browser/upgrade_detector.h"
|
| -#include "chrome/common/chrome_switches.h"
|
| #include "chrome/common/content_restriction.h"
|
| #include "chrome/common/pref_names.h"
|
| #include "components/bookmarks/browser/bookmark_model.h"
|
| @@ -112,6 +111,10 @@
|
| #include "components/rlz/rlz_tracker.h"
|
| #endif
|
|
|
| +#if defined(ENABLE_MEDIA_ROUTER)
|
| +#include "chrome/browser/media/router/media_router_dialog_controller.h"
|
| +#endif
|
| +
|
| namespace {
|
| const char kOsOverrideForTabletSite[] = "Linux; Android 4.0.3";
|
| }
|
| @@ -929,7 +932,8 @@ bool CanBasicPrint(Browser* browser) {
|
| #endif // ENABLE_BASIC_PRINTING
|
|
|
| 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
|
| @@ -938,6 +942,7 @@ bool CanRouteMedia(Browser* browser) {
|
| }
|
|
|
| void RouteMedia(Browser* browser) {
|
| +#if defined(ENABLE_MEDIA_ROUTER)
|
| DCHECK(CanRouteMedia(browser));
|
|
|
| media_router::MediaRouterDialogController* dialog_controller =
|
| @@ -947,6 +952,7 @@ void RouteMedia(Browser* browser) {
|
| return;
|
|
|
| dialog_controller->ShowMediaRouterDialog();
|
| +#endif // defined(ENABLE_MEDIA_ROUTER)
|
| }
|
|
|
| void EmailPageLocation(Browser* browser) {
|
|
|