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

Unified Diff: chrome/browser/ui/browser_commands.cc

Issue 551773002: Revert piece of "Removed Ctrl+Shift+P shortcut for system dialog printing on Windows." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@r517193003
Patch Set: Mon Sep 8 02:06:35 PDT 2014 Created 6 years, 3 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 | « no previous file | no next file » | 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 e82149b54c89394c18fe45632cc75b654a069b40..071991caf136518c97bf1c7b0d00860acceda411 100644
--- a/chrome/browser/ui/browser_commands.cc
+++ b/chrome/browser/ui/browser_commands.cc
@@ -892,6 +892,15 @@ void BasicPrint(Browser* browser) {
}
bool CanBasicPrint(Browser* browser) {
+ // If printing is not disabled via pref or policy, it is always possible to
+ // advanced print when the print preview is visible. The exception to this
+ // is under Win8 ash, since showing the advanced print dialog will open it
+ // modally on the Desktop and hang the browser.
+#if defined(OS_WIN)
+ if (chrome::GetActiveDesktop() == chrome::HOST_DESKTOP_TYPE_ASH)
+ return false;
+#endif
+
return browser->profile()->GetPrefs()->GetBoolean(prefs::kPrintingEnabled) &&
(PrintPreviewShowing(browser) || CanPrint(browser));
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698