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

Unified Diff: chrome/browser/ui/webui/print_preview/print_preview_handler.cc

Issue 2376193006: Disable Ctrl+Shift+P on Chrome OS (Closed)
Patch Set: Fix test. Created 4 years, 2 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
Index: chrome/browser/ui/webui/print_preview/print_preview_handler.cc
diff --git a/chrome/browser/ui/webui/print_preview/print_preview_handler.cc b/chrome/browser/ui/webui/print_preview/print_preview_handler.cc
index 3fc1a13edeadf563ae804989cb5b7852475140a3..e5f1b35d01d4236185ac4f2cf2e4defe9fd4372c 100644
--- a/chrome/browser/ui/webui/print_preview/print_preview_handler.cc
+++ b/chrome/browser/ui/webui/print_preview/print_preview_handler.cc
@@ -609,11 +609,11 @@ void PrintPreviewHandler::RegisterMessages() {
web_ui()->RegisterMessageCallback("getPrinterCapabilities",
base::Bind(&PrintPreviewHandler::HandleGetPrinterCapabilities,
base::Unretained(this)));
-#if defined(ENABLE_BASIC_PRINTING)
+#if defined(ENABLE_BASIC_PRINTING) && !defined(OS_CHROMEOS)
web_ui()->RegisterMessageCallback("showSystemDialog",
base::Bind(&PrintPreviewHandler::HandleShowSystemDialog,
base::Unretained(this)));
-#endif // ENABLE_BASIC_PRINTING
+#endif // ENABLE_BASIC_PRINTING && !OS_CHROMEOS
Lei Zhang 2016/10/03 23:03:58 omit?
skau 2016/10/03 23:32:13 Done.
web_ui()->RegisterMessageCallback("signIn",
base::Bind(&PrintPreviewHandler::HandleSignin,
base::Unretained(this)));
@@ -1145,7 +1145,7 @@ void PrintPreviewHandler::HandleManageCloudPrint(
ui::PAGE_TRANSITION_LINK, false));
}
-#if defined(ENABLE_BASIC_PRINTING)
+#if defined(ENABLE_BASIC_PRINTING) && !defined(OS_CHROMEOS)
void PrintPreviewHandler::HandleShowSystemDialog(
const base::ListValue* /*args*/) {
ReportStats();
@@ -1164,7 +1164,7 @@ void PrintPreviewHandler::HandleShowSystemDialog(
// Cancel the pending preview request if exists.
print_preview_ui()->OnCancelPendingPreviewRequest();
}
-#endif // ENABLE_BASIC_PRINTING
+#endif // ENABLE_BASIC_PRINTING && !OS_CHROMEOS
Lei Zhang 2016/10/03 23:03:58 omit?
skau 2016/10/03 23:32:13 This is a little far from the if. I'm going to le
void PrintPreviewHandler::HandleManagePrinters(
const base::ListValue* /*args*/) {
@@ -1411,11 +1411,11 @@ void PrintPreviewHandler::OnPrintPreviewFailed() {
ReportUserActionHistogram(PREVIEW_FAILED);
}
-#if defined(ENABLE_BASIC_PRINTING)
+#if defined(ENABLE_BASIC_PRINTING) && !defined(OS_CHROMEOS)
void PrintPreviewHandler::ShowSystemDialog() {
HandleShowSystemDialog(NULL);
}
-#endif // ENABLE_BASIC_PRINTING
+#endif // ENABLE_BASIC_PRINTING && !OS_CHROMEOS
Lei Zhang 2016/10/03 23:03:58 omit?
skau 2016/10/03 23:32:13 Done.
void PrintPreviewHandler::FileSelected(const base::FilePath& path,
int /* index */,

Powered by Google App Engine
This is Rietveld 408576698