Chromium Code Reviews| 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 210adc6d75d706936ca9186a699bc107e60d67e6..beaf8079addc54ae4c3a737fe9861b28e07f58f3 100644 |
| --- a/chrome/browser/renderer_context_menu/render_view_context_menu.cc |
| +++ b/chrome/browser/renderer_context_menu/render_view_context_menu.cc |
| @@ -1583,9 +1583,7 @@ bool RenderViewContextMenu::IsCommandIdEnabled(int id) const { |
| incognito_avail != IncognitoModePrefs::DISABLED; |
| case IDC_PRINT: |
| - return prefs->GetBoolean(prefs::kPrintingEnabled) && |
| - (params_.media_type == WebContextMenuData::MediaTypeNone || |
| - params_.media_flags & WebContextMenuData::MediaCanPrint); |
| + return IsPrintPreviewEnabled(); |
| case IDC_CONTENT_CONTEXT_SEARCHWEBFOR: |
| case IDC_CONTENT_CONTEXT_GOTOURL: |
| @@ -2082,6 +2080,16 @@ bool RenderViewContextMenu::IsPasteAndMatchStyleEnabled() const { |
| ui::CLIPBOARD_TYPE_COPY_PASTE); |
| } |
| +bool RenderViewContextMenu::IsPrintPreviewEnabled() const { |
| + if (params_.media_type != WebContextMenuData::MediaTypeNone && |
| + !(params_.media_flags & WebContextMenuData::MediaCanPrint)) { |
| + return false; |
| + } |
| + |
| + Browser* browser = chrome::FindLastActive(); |
|
takumif
2016/08/05 21:48:56
As I wrote in the reason for the reversion, we can
|
| + return browser && chrome::CanPrint(browser); |
| +} |
| + |
| bool RenderViewContextMenu::IsRouteMediaEnabled() const { |
| if (!media_router::MediaRouterEnabled(browser_context_)) |
| return false; |