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

Unified Diff: chrome/browser/renderer_context_menu/render_view_context_menu.cc

Issue 2214323003: Revert of Disable Print in the context menu when a modal dialog is shown (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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/renderer_context_menu/render_view_context_menu.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 0f3e300c174b8f894258459fe67c5c4baf23f177..210adc6d75d706936ca9186a699bc107e60d67e6 100644
--- a/chrome/browser/renderer_context_menu/render_view_context_menu.cc
+++ b/chrome/browser/renderer_context_menu/render_view_context_menu.cc
@@ -1583,7 +1583,9 @@
incognito_avail != IncognitoModePrefs::DISABLED;
case IDC_PRINT:
- return IsPrintPreviewEnabled();
+ return prefs->GetBoolean(prefs::kPrintingEnabled) &&
+ (params_.media_type == WebContextMenuData::MediaTypeNone ||
+ params_.media_flags & WebContextMenuData::MediaCanPrint);
case IDC_CONTENT_CONTEXT_SEARCHWEBFOR:
case IDC_CONTENT_CONTEXT_GOTOURL:
@@ -2080,17 +2082,6 @@
ui::CLIPBOARD_TYPE_COPY_PASTE);
}
-bool RenderViewContextMenu::IsPrintPreviewEnabled() const {
- if (params_.media_type != WebContextMenuData::MediaTypeNone &&
- !(params_.media_flags & WebContextMenuData::MediaCanPrint)) {
- return false;
- }
-
- // |browser| is a nullptr if a modal dialog is open.
- Browser* browser = chrome::FindBrowserWithWebContents(source_web_contents_);
- return browser && chrome::CanPrint(browser);
-}
-
bool RenderViewContextMenu::IsRouteMediaEnabled() const {
if (!media_router::MediaRouterEnabled(browser_context_))
return false;
« no previous file with comments | « chrome/browser/renderer_context_menu/render_view_context_menu.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698