Index: chrome/browser/renderer_context_menu/render_view_context_menu.cc |
diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu.cc b/chrome/browser/renderer_context_menu/render_view_context_menu.cc |
index e55c14ed5a20f5d9adfa9be68a3a9e107c4471f1..3c24b6313854d6baee2c5d593665b5d546363d71 100644 |
--- a/chrome/browser/renderer_context_menu/render_view_context_menu.cc |
+++ b/chrome/browser/renderer_context_menu/render_view_context_menu.cc |
@@ -31,6 +31,9 @@ |
#include "chrome/browser/download/download_service.h" |
#include "chrome/browser/download/download_service_factory.h" |
#include "chrome/browser/download/download_stats.h" |
+#include "chrome/browser/media/router/media_router_dialog_controller.h" |
+#include "chrome/browser/media/router/media_router_feature.h" |
+#include "chrome/browser/media/router/media_router_metrics.h" |
#include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.h" |
#include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings_factory.h" |
#include "chrome/browser/password_manager/chrome_password_manager_client.h" |
@@ -149,12 +152,6 @@ |
#endif // BUILDFLAG(ENABLE_PRINT_PREVIEW) |
#endif // BUILDFLAG(ENABLE_PRINTING) |
-#if defined(ENABLE_MEDIA_ROUTER) |
-#include "chrome/browser/media/router/media_router_dialog_controller.h" |
-#include "chrome/browser/media/router/media_router_feature.h" |
-#include "chrome/browser/media/router/media_router_metrics.h" |
-#endif |
- |
#if defined(GOOGLE_CHROME_BUILD) |
#include "chrome/grit/theme_resources.h" |
#include "ui/base/resource/resource_bundle.h" |
@@ -1304,12 +1301,10 @@ void RenderViewContextMenu::AppendPrintItem() { |
} |
void RenderViewContextMenu::AppendMediaRouterItem() { |
-#if defined(ENABLE_MEDIA_ROUTER) |
if (media_router::MediaRouterEnabled(browser_context_)) { |
menu_model_.AddItemWithStringId(IDC_ROUTE_MEDIA, |
IDS_MEDIA_ROUTER_MENU_ITEM_TITLE); |
} |
-#endif // defined(ENABLE_MEDIA_ROUTER) |
} |
void RenderViewContextMenu::AppendRotationItems() { |
@@ -2151,7 +2146,6 @@ bool RenderViewContextMenu::IsPrintPreviewEnabled() const { |
} |
bool RenderViewContextMenu::IsRouteMediaEnabled() const { |
-#if defined(ENABLE_MEDIA_ROUTER) |
if (!media_router::MediaRouterEnabled(browser_context_)) |
return false; |
@@ -2171,9 +2165,6 @@ bool RenderViewContextMenu::IsRouteMediaEnabled() const { |
const web_modal::WebContentsModalDialogManager* manager = |
web_modal::WebContentsModalDialogManager::FromWebContents(web_contents); |
return !manager || !manager->IsDialogActive(); |
-#else |
- return false; |
-#endif // defined(ENABLE_MEDIA_ROUTER) |
} |
bool RenderViewContextMenu::IsOpenLinkOTREnabled() const { |
@@ -2443,7 +2434,6 @@ void RenderViewContextMenu::ExecPrint() { |
} |
void RenderViewContextMenu::ExecRouteMedia() { |
-#if defined(ENABLE_MEDIA_ROUTER) |
if (!media_router::MediaRouterEnabled(browser_context_)) |
return; |
@@ -2456,7 +2446,6 @@ void RenderViewContextMenu::ExecRouteMedia() { |
dialog_controller->ShowMediaRouterDialog(); |
media_router::MediaRouterMetrics::RecordMediaRouterDialogOrigin( |
media_router::MediaRouterDialogOpenOrigin::CONTEXTUAL_MENU); |
-#endif // defined(ENABLE_MEDIA_ROUTER) |
} |
void RenderViewContextMenu::ExecTranslate() { |