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

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

Issue 522493002: Removed Ctrl+Shift+P shortcut for system dialog printing on Windows. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fri Aug 29 11:27:33 PDT 2014 Created 6 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/ui/browser_commands.h ('k') | chrome/browser/ui/views/accelerator_table.cc » ('j') | 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 fcf6d1b95f830508c9c93c8c31760842ead863ad..9ff7443679b6ac2d3287dd93d9ef3e3c96f5d75d 100644
--- a/chrome/browser/ui/browser_commands.cc
+++ b/chrome/browser/ui/browser_commands.cc
@@ -872,6 +872,7 @@ bool CanPrint(Browser* browser) {
GetContentRestrictions(browser) & CONTENT_RESTRICTION_PRINT);
}
+#if !defined(OS_WIN)
void AdvancedPrint(Browser* browser) {
#if defined(ENABLE_FULL_PRINTING)
printing::PrintViewManager* print_view_manager =
@@ -882,19 +883,10 @@ void AdvancedPrint(Browser* browser) {
}
bool CanAdvancedPrint(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. We can remove this check
- // once we integrate with the system print charm.
-#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));
}
+#endif // !OS_WIN
void PrintToDestination(Browser* browser) {
#if defined(ENABLE_FULL_PRINTING)
« no previous file with comments | « chrome/browser/ui/browser_commands.h ('k') | chrome/browser/ui/views/accelerator_table.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698