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

Side by Side Diff: chrome/service/cloud_print/cloud_print_connector.cc

Issue 94013004: Add base:: to string16s in chrome/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: try again Created 7 years 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/installer/util/wmi.cc ('k') | chrome/service/cloud_print/print_system_xps_win.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/service/cloud_print/cloud_print_connector.h" 5 #include "chrome/service/cloud_print/cloud_print_connector.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/md5.h" 9 #include "base/md5.h"
10 #include "base/rand_util.h" 10 #include "base/rand_util.h"
(...skipping 571 matching lines...) Expand 10 before | Expand all | Expand 10 after
582 const printing::PrinterCapsAndDefaults& caps_and_defaults) { 582 const printing::PrinterCapsAndDefaults& caps_and_defaults) {
583 if (!IsRunning()) 583 if (!IsRunning())
584 return; // Orphant call. 584 return; // Orphant call.
585 DCHECK(pending_tasks_.size() > 0 && 585 DCHECK(pending_tasks_.size() > 0 &&
586 pending_tasks_.front().type == PENDING_PRINTER_REGISTER); 586 pending_tasks_.front().type == PENDING_PRINTER_REGISTER);
587 587
588 if (!succeeded) { 588 if (!succeeded) {
589 LOG(ERROR) << "CP_CONNECTOR: Failed to get printer info" 589 LOG(ERROR) << "CP_CONNECTOR: Failed to get printer info"
590 << ", printer name: " << printer_name; 590 << ", printer name: " << printer_name;
591 // This printer failed to register, notify the server of this failure. 591 // This printer failed to register, notify the server of this failure.
592 string16 printer_name_utf16 = UTF8ToUTF16(printer_name); 592 base::string16 printer_name_utf16 = UTF8ToUTF16(printer_name);
593 std::string status_message = l10n_util::GetStringFUTF8( 593 std::string status_message = l10n_util::GetStringFUTF8(
594 IDS_CLOUD_PRINT_REGISTER_PRINTER_FAILED, 594 IDS_CLOUD_PRINT_REGISTER_PRINTER_FAILED,
595 printer_name_utf16, 595 printer_name_utf16,
596 l10n_util::GetStringUTF16(IDS_GOOGLE_CLOUD_PRINT)); 596 l10n_util::GetStringUTF16(IDS_GOOGLE_CLOUD_PRINT));
597 ReportUserMessage(kGetPrinterCapsFailedMessageId, status_message); 597 ReportUserMessage(kGetPrinterCapsFailedMessageId, status_message);
598 598
599 ContinuePendingTaskProcessing(); // Skip this printer registration. 599 ContinuePendingTaskProcessing(); // Skip this printer registration.
600 return; 600 return;
601 } 601 }
602 602
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
642 kCloudPrintAPIMaxRetryCount, mime_type, post_data, 642 kCloudPrintAPIMaxRetryCount, mime_type, post_data,
643 &CloudPrintConnector::HandleRegisterPrinterResponse); 643 &CloudPrintConnector::HandleRegisterPrinterResponse);
644 } 644 }
645 645
646 bool CloudPrintConnector::IsSamePrinter(const std::string& name1, 646 bool CloudPrintConnector::IsSamePrinter(const std::string& name1,
647 const std::string& name2) const { 647 const std::string& name2) const {
648 return (0 == base::strcasecmp(name1.c_str(), name2.c_str())); 648 return (0 == base::strcasecmp(name1.c_str(), name2.c_str()));
649 } 649 }
650 650
651 } // namespace cloud_print 651 } // namespace cloud_print
OLDNEW
« no previous file with comments | « chrome/installer/util/wmi.cc ('k') | chrome/service/cloud_print/print_system_xps_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698