diff options
| author | dbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-20 09:03:15 +0000 |
|---|---|---|
| committer | dbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-20 09:03:15 +0000 |
| commit | 05aab99c37809726da162f19dfa0702a61857a8d (patch) | |
| tree | fdcf72a3b2202eabb345ccc6a39287860e708b18 /chrome/service | |
| parent | 2f1c6d806a644e6765ef7142931af351443055db (diff) | |
| download | chromium_src-05aab99c37809726da162f19dfa0702a61857a8d.zip chromium_src-05aab99c37809726da162f19dfa0702a61857a8d.tar.gz chromium_src-05aab99c37809726da162f19dfa0702a61857a8d.tar.bz2 | |
Add base:: to string16s in chrome/.
TBR=sky@chromium.org
BUG=329295
Review URL: https://codereview.chromium.org/94013004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242048 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/service')
| -rw-r--r-- | chrome/service/cloud_print/cloud_print_connector.cc | 2 | ||||
| -rw-r--r-- | chrome/service/cloud_print/print_system_xps_win.cc | 2 | ||||
| -rw-r--r-- | chrome/service/cloud_print/printer_job_handler.cc | 2 | ||||
| -rw-r--r-- | chrome/service/service_process.cc | 7 |
4 files changed, 7 insertions, 6 deletions
diff --git a/chrome/service/cloud_print/cloud_print_connector.cc b/chrome/service/cloud_print/cloud_print_connector.cc index 524d62a..54fb72a7e 100644 --- a/chrome/service/cloud_print/cloud_print_connector.cc +++ b/chrome/service/cloud_print/cloud_print_connector.cc @@ -589,7 +589,7 @@ void CloudPrintConnector::OnReceivePrinterCaps( LOG(ERROR) << "CP_CONNECTOR: Failed to get printer info" << ", printer name: " << printer_name; // This printer failed to register, notify the server of this failure. - string16 printer_name_utf16 = UTF8ToUTF16(printer_name); + base::string16 printer_name_utf16 = UTF8ToUTF16(printer_name); std::string status_message = l10n_util::GetStringFUTF8( IDS_CLOUD_PRINT_REGISTER_PRINTER_FAILED, printer_name_utf16, diff --git a/chrome/service/cloud_print/print_system_xps_win.cc b/chrome/service/cloud_print/print_system_xps_win.cc index 622b046..e15f224 100644 --- a/chrome/service/cloud_print/print_system_xps_win.cc +++ b/chrome/service/cloud_print/print_system_xps_win.cc @@ -175,7 +175,7 @@ class JobSpoolerWin : public PrintSystem::JobSpooler { hr = E_FAIL; DOCINFO di = {0}; di.cbSize = sizeof(DOCINFO); - string16 doc_name = UTF8ToUTF16(job_title); + base::string16 doc_name = UTF8ToUTF16(job_title); DCHECK(printing::SimplifyDocumentTitle(doc_name) == doc_name); di.lpszDocName = doc_name.c_str(); job_id_ = StartDoc(dc, &di); diff --git a/chrome/service/cloud_print/printer_job_handler.cc b/chrome/service/cloud_print/printer_job_handler.cc index 6f56085..3919843 100644 --- a/chrome/service/cloud_print/printer_job_handler.cc +++ b/chrome/service/cloud_print/printer_job_handler.cc @@ -773,7 +773,7 @@ void PrinterJobHandler::DoPrint(const JobDetails& job_details, DCHECK(job_spooler_.get()); if (!job_spooler_.get()) return; - string16 document_name = + base::string16 document_name = printing::SimplifyDocumentTitle(UTF8ToUTF16(job_details.job_title_)); if (document_name.empty()) { document_name = printing::SimplifyDocumentTitle( diff --git a/chrome/service/service_process.cc b/chrome/service/service_process.cc index 0243531..c8816ef 100644 --- a/chrome/service/service_process.cc +++ b/chrome/service/service_process.cc @@ -101,10 +101,11 @@ void PrepareRestartOnCrashEnviroment( // The encoding we use for the info is "title|context|direction" where // direction is either env_vars::kRtlLocale or env_vars::kLtrLocale depending // on the current locale. - string16 dlg_strings(l10n_util::GetStringUTF16(IDS_CRASH_RECOVERY_TITLE)); + base::string16 dlg_strings( + l10n_util::GetStringUTF16(IDS_CRASH_RECOVERY_TITLE)); dlg_strings.push_back('|'); - string16 adjusted_string( - l10n_util::GetStringFUTF16(IDS_SERVICE_CRASH_RECOVERY_CONTENT, + base::string16 adjusted_string(l10n_util::GetStringFUTF16( + IDS_SERVICE_CRASH_RECOVERY_CONTENT, l10n_util::GetStringUTF16(IDS_GOOGLE_CLOUD_PRINT))); base::i18n::AdjustStringForLocaleDirection(&adjusted_string); dlg_strings.append(adjusted_string); |