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

Unified Diff: chrome/browser/ui/browser_command_controller.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/app/chrome_dll.rc ('k') | chrome/browser/ui/browser_commands.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/browser_command_controller.cc
diff --git a/chrome/browser/ui/browser_command_controller.cc b/chrome/browser/ui/browser_command_controller.cc
index cc041b4646a4f966599c5f6fecab6f29bc966226..1c56704a96df0332b3eb3a2755ebf0393269a88e 100644
--- a/chrome/browser/ui/browser_command_controller.cc
+++ b/chrome/browser/ui/browser_command_controller.cc
@@ -542,10 +542,12 @@ void BrowserCommandController::ExecuteCommandWithDisposition(
case IDC_PRINT:
Print(browser_);
break;
+#if !defined(OS_WIN)
case IDC_ADVANCED_PRINT:
content::RecordAction(base::UserMetricsAction("Accel_Advanced_Print"));
AdvancedPrint(browser_);
break;
+#endif // !OS_WIN
case IDC_PRINT_TO_DESTINATION:
PrintToDestination(browser_);
break;
@@ -1273,11 +1275,10 @@ void BrowserCommandController::UpdateCommandsForFullscreenMode() {
void BrowserCommandController::UpdatePrintingState() {
bool print_enabled = CanPrint(browser_);
command_updater_.UpdateCommandEnabled(IDC_PRINT, print_enabled);
+#if !defined(OS_WIN)
command_updater_.UpdateCommandEnabled(IDC_ADVANCED_PRINT,
CanAdvancedPrint(browser_));
- command_updater_.UpdateCommandEnabled(IDC_PRINT_TO_DESTINATION,
- print_enabled);
-#if defined(OS_WIN)
+#else // !OS_WIN
HMODULE metro_module = base::win::GetMetroModule();
if (metro_module != NULL) {
typedef void (*MetroEnablePrinting)(BOOL);
@@ -1287,7 +1288,7 @@ void BrowserCommandController::UpdatePrintingState() {
if (metro_enable_printing)
metro_enable_printing(print_enabled);
}
-#endif
+#endif // !OS_WIN
}
void BrowserCommandController::UpdateSaveAsState() {
« no previous file with comments | « chrome/app/chrome_dll.rc ('k') | chrome/browser/ui/browser_commands.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698