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

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

Issue 2760753002: [CUPS] Implement the local CUPS printer setup waiting UI. (Closed)
Patch Set: Address dpapad@'s comments. Fix failed test. Created 3 years, 9 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/resources/print_preview/search/destination_search.js ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/print_preview/print_preview_ui.cc
diff --git a/chrome/browser/ui/webui/print_preview/print_preview_ui.cc b/chrome/browser/ui/webui/print_preview/print_preview_ui.cc
index b78c75dda004427eac79397f7c564a76aab0ce39..9c7a8f80956fe6b94b2e282a002f934e2af67f11 100644
--- a/chrome/browser/ui/webui/print_preview/print_preview_ui.cc
+++ b/chrome/browser/ui/webui/print_preview/print_preview_ui.cc
@@ -62,7 +62,7 @@ namespace {
#if defined(OS_MACOSX)
// U+0028 U+21E7 U+2318 U+0050 U+0029 in UTF8
const char kBasicPrintShortcut[] = "\x28\xE2\x8c\xA5\xE2\x8C\x98\x50\x29";
-#else
+#elif !defined(OS_CHROMEOS)
const char kBasicPrintShortcut[] = "(Ctrl+Shift+P)";
#endif
@@ -235,11 +235,13 @@ content::WebUIDataSource* CreatePrintPreviewUISource() {
source->AddLocalizedString(
"resolveExtensionUSBErrorMessage",
IDS_PRINT_PREVIEW_RESOLVE_EXTENSION_USB_ERROR_MESSAGE);
- source->AddLocalizedString(
- "resolveCrosPrinterMessage",
- IDS_PRINT_PREVIEW_RESOLVE_CROS_DESTINATION_MESSAGE);
+#if defined(OS_CHROMEOS)
+ source->AddLocalizedString("configuringInProgressText",
+ IDS_PRINT_CONFIGURING_IN_PROGRESS_TEXT);
+ source->AddLocalizedString("configuringFailedText",
+ IDS_PRINT_CONFIGURING_FAILED_TEXT);
+#else
const base::string16 shortcut_text(base::UTF8ToUTF16(kBasicPrintShortcut));
-#if !defined(OS_CHROMEOS)
source->AddString(
"systemDialogOption",
l10n_util::GetStringFUTF16(
« no previous file with comments | « chrome/browser/resources/print_preview/search/destination_search.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698