Commit 4d6758a4 authored by vitalybuka's avatar vitalybuka Committed by Commit bot

Check still could be useful if code compiled without full printing.

>> Removed Ctrl+Shift+P shortcut for system dialog printing on Windows.
>>    BUG=374321
>>    Review URL: https://codereview.chromium.org/522493002
TBR=thestig@chromium.org
NOTRY=true

Review URL: https://codereview.chromium.org/551773002

Cr-Commit-Position: refs/heads/master@{#293752}
parent 114290f6
...@@ -892,6 +892,15 @@ void BasicPrint(Browser* browser) { ...@@ -892,6 +892,15 @@ void BasicPrint(Browser* browser) {
} }
bool CanBasicPrint(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) && return browser->profile()->GetPrefs()->GetBoolean(prefs::kPrintingEnabled) &&
(PrintPreviewShowing(browser) || CanPrint(browser)); (PrintPreviewShowing(browser) || CanPrint(browser));
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment