Cleanup: Use base namespace in printing/.

Review URL: https://codereview.chromium.org/24989002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@226174 0039d316-1c4b-4281-b951-d872f2087c98
SaschaDeWaal · Oct 1, 2013 · b5fa4ee · b5fa4ee
1 parent 5f80e07
commit b5fa4ee
Show file tree

Hide file tree

Showing 22 changed files with 49 additions and 47 deletions.
diff --git a/printing/backend/print_backend.cc b/printing/backend/print_backend.cc
@@ -33,12 +33,13 @@ PrinterCapsAndDefaults::~PrinterCapsAndDefaults() {}
 
 PrintBackend::~PrintBackend() {}
 
-string16 PrintBackend::SimplifyDocumentTitle(const string16& title) {
-  string16 no_controls(title);
+base::string16 PrintBackend::SimplifyDocumentTitle(
+    const base::string16& title) {
+  base::string16 no_controls(title);
   no_controls.erase(
     std::remove_if(no_controls.begin(), no_controls.end(), &u_iscntrl),
     no_controls.end());
-  string16 result;
+  base::string16 result;
   gfx::ElideString(no_controls, kMaxDocumentTitleLength, &result);
   return result;
 }

diff --git a/printing/backend/print_backend.h b/printing/backend/print_backend.h
@@ -94,7 +94,7 @@ class PRINTING_EXPORT PrintBackend
   virtual bool IsValidPrinter(const std::string& printer_name) = 0;
 
   // Simplify title to resolve issue with some drivers.
-  static string16 SimplifyDocumentTitle(const string16& title);
+  static base::string16 SimplifyDocumentTitle(const base::string16& title);
 
   // Allocate a print backend. If |print_backend_settings| is NULL, default
   // settings will be used.

diff --git a/printing/backend/win_helper.cc b/printing/backend/win_helper.cc
@@ -139,7 +139,7 @@ bool XPSModule::InitImpl() {
   return true;
 }
 
-HRESULT XPSModule::OpenProvider(const string16& printer_name,
+HRESULT XPSModule::OpenProvider(const base::string16& printer_name,
                                 DWORD version,
                                 HPTPROVIDER* provider) {
   return g_open_provider_proc(printer_name.c_str(), version, provider);

diff --git a/printing/backend/win_helper.h b/printing/backend/win_helper.h
@@ -72,7 +72,7 @@ class PRINTING_EXPORT XPSModule {
   // All the other methods can ONLY be called after a successful call to Init.
   // Init can be called many times and by multiple threads.
   static bool Init();
-  static HRESULT OpenProvider(const string16& printer_name,
+  static HRESULT OpenProvider(const base::string16& printer_name,
                               DWORD version,
                               HPTPROVIDER* provider);
   static HRESULT GetPrintCapabilities(HPTPROVIDER provider,

diff --git a/printing/print_dialog_gtk_interface.h b/printing/print_dialog_gtk_interface.h
@@ -41,7 +41,7 @@ class PrintDialogGtkInterface {
   // Called from the print worker thread. Once called, the
   // PrintDialogGtkInterface instance should not be reused.
   virtual void PrintDocument(const Metafile* metafile,
-                             const string16& document_name) = 0;
+                             const base::string16& document_name) = 0;
 
   // Same as AddRef/Release, but with different names since
   // PrintDialogGtkInterface does not inherit from RefCounted.

diff --git a/printing/print_settings.cc b/printing/print_settings.cc
@@ -132,9 +132,9 @@ void PrintSettings::Clear() {
   max_shrink = 2.;
   desired_dpi = 72;
   selection_only = false;
-  date = string16();
-  title = string16();
-  url = string16();
+  date = base::string16();
+  title = base::string16();
+  url = base::string16();
   display_header_footer = false;
   printer_name_.clear();
   device_name_.clear();

diff --git a/printing/print_settings.h b/printing/print_settings.h
@@ -48,14 +48,14 @@ class PRINTING_EXPORT PrintSettings {
   bool Equals(const PrintSettings& rhs) const;
 
   void set_landscape(bool landscape) { landscape_ = landscape; }
-  void set_printer_name(const string16& printer_name) {
+  void set_printer_name(const base::string16& printer_name) {
     printer_name_ = printer_name;
   }
-  const string16& printer_name() const { return printer_name_; }
-  void set_device_name(const string16& device_name) {
+  const base::string16& printer_name() const { return printer_name_; }
+  void set_device_name(const base::string16& device_name) {
     device_name_ = device_name;
   }
-  const string16& device_name() const { return device_name_; }
+  const base::string16& device_name() const { return device_name_; }
   void set_dpi(int dpi) { dpi_ = dpi; }
   int dpi() const { return dpi_; }
   void set_supports_alpha_blend(bool supports_alpha_blend) {
@@ -109,9 +109,9 @@ class PRINTING_EXPORT PrintSettings {
   void SetOrientation(bool landscape);
 
   // Strings to be printed as headers and footers if requested by the user.
-  string16 date;
-  string16 title;
-  string16 url;
+  base::string16 date;
+  base::string16 title;
+  base::string16 url;
 
   // True if the user wants headers and footers to be displayed.
   bool display_header_footer;
@@ -124,10 +124,10 @@ class PRINTING_EXPORT PrintSettings {
   // Settings that can't be changed without side-effects.
 
   // Printer name as shown to the user.
-  string16 printer_name_;
+  base::string16 printer_name_;
 
   // Printer device name as opened by the OS.
-  string16 device_name_;
+  base::string16 device_name_;
 
   // Page setup in device units.
   PageSetup page_setup_device_units_;

diff --git a/printing/print_settings_initializer.cc b/printing/print_settings_initializer.cc
@@ -21,12 +21,10 @@
 #include "ui/gfx/text_elider.h"
 #include "url/gurl.h"
 
-using base::DictionaryValue;
-
 namespace printing {
 
 void PrintSettingsInitializer::InitHeaderFooterStrings(
-      const DictionaryValue& job_settings,
+      const base::DictionaryValue& job_settings,
       PrintSettings* print_settings) {
   if (!job_settings.GetBoolean(kSettingHeaderFooterEnabled,
                                &print_settings->display_header_footer)) {
@@ -35,9 +33,9 @@ void PrintSettingsInitializer::InitHeaderFooterStrings(
   if (!print_settings->display_header_footer)
     return;
 
-  string16 date = base::TimeFormatShortDateNumeric(base::Time::Now());
-  string16 title;
-  string16 url;
+  base::string16 date = base::TimeFormatShortDateNumeric(base::Time::Now());
+  base::string16 title;
+  base::string16 url;
   if (!job_settings.GetString(kSettingHeaderFooterTitle, &title) ||
       !job_settings.GetString(kSettingHeaderFooterURL, &url)) {
     NOTREACHED();

diff --git a/printing/print_settings_initializer_gtk.cc b/printing/print_settings_initializer_gtk.cc
@@ -25,7 +25,7 @@ void PrintSettingsInitializerGtk::InitPrintSettings(
   DCHECK(page_setup);
   DCHECK(print_settings);
 
-  string16 name(UTF8ToUTF16(static_cast<const char*>(
+  base::string16 name(base::UTF8ToUTF16(static_cast<const char*>(
       gtk_print_settings_get_printer(settings))));
   print_settings->set_printer_name(name);
   print_settings->set_device_name(print_settings->printer_name());

diff --git a/printing/printed_document.cc b/printing/printed_document.cc
@@ -176,18 +176,20 @@ void PrintedDocument::DebugDump(const PrintedPage& page) {
   if (!g_debug_dump_info.Get().enabled)
     return;
 
-  string16 filename;
+  base::string16 filename;
   filename += name();
-  filename += ASCIIToUTF16("_");
-  filename += ASCIIToUTF16(base::StringPrintf("%02d", page.page_number()));
+  filename += base::ASCIIToUTF16("_");
+  filename += base::ASCIIToUTF16(
+      base::StringPrintf("%02d", page.page_number()));
 #if defined(OS_WIN)
-  filename += ASCIIToUTF16("_.emf");
+  filename += base::ASCIIToUTF16("_.emf");
   page.metafile()->SaveTo(
       g_debug_dump_info.Get().debug_dump_path.Append(filename));
 #else  // OS_WIN
-  filename += ASCIIToUTF16("_.pdf");
+  filename += base::ASCIIToUTF16("_.pdf");
   page.metafile()->SaveTo(
-      g_debug_dump_info.Get().debug_dump_path.Append(UTF16ToUTF8(filename)));
+      g_debug_dump_info.Get().debug_dump_path.Append(
+          base::UTF16ToUTF8(filename)));
 #endif  // OS_WIN
 }
 

diff --git a/printing/printed_document.h b/printing/printed_document.h
@@ -90,7 +90,7 @@ class PRINTING_EXPORT PrintedDocument
 
   // Getters. All these items are immutable hence thread-safe.
   const PrintSettings& settings() const { return immutable_.settings_; }
-  const string16& name() const { return immutable_.name_; }
+  const base::string16& name() const { return immutable_.name_; }
   int cookie() const { return immutable_.cookie_; }
 
   // Sets a path where to dump printing output files for debugging. If never set
@@ -149,7 +149,7 @@ class PRINTING_EXPORT PrintedDocument
     base::MessageLoop* source_message_loop_;
 
     // Document name. Immutable.
-    string16 name_;
+    base::string16 name_;
 
     // Cookie to uniquely identify this document. It is used to make sure that a
     // PrintedPage is correctly belonging to the PrintedDocument. Since

diff --git a/printing/printed_pages_source.h b/printing/printed_pages_source.h
@@ -13,7 +13,7 @@ namespace printing {
 class PrintedPagesSource {
  public:
   // Returns the document title.
-  virtual string16 RenderSourceName() = 0;
+  virtual base::string16 RenderSourceName() = 0;
 
  protected:
   virtual ~PrintedPagesSource() {}

diff --git a/printing/printing_context.h b/printing/printing_context.h
@@ -71,7 +71,7 @@ class PRINTING_EXPORT PrintingContext {
   // like IPC message processing! Some printers have side-effects on this call
   // like virtual printers that ask the user for the path of the saved document;
   // for example a PDF printer.
-  virtual Result NewDocument(const string16& document_name) = 0;
+  virtual Result NewDocument(const base::string16& document_name) = 0;
 
   // Starts a new page.
   virtual Result NewPage() = 0;
@@ -128,6 +128,7 @@ class PRINTING_EXPORT PrintingContext {
   // The application locale.
   std::string app_locale_;
 
+ private:
   DISALLOW_COPY_AND_ASSIGN(PrintingContext);
 };
 

diff --git a/printing/printing_context_android.h b/printing/printing_context_android.h
@@ -41,7 +41,7 @@ class PRINTING_EXPORT PrintingContextAndroid : public PrintingContext {
       const base::DictionaryValue& job_settings,
       const PageRanges& ranges) OVERRIDE;
   virtual Result InitWithSettings(const PrintSettings& settings) OVERRIDE;
-  virtual Result NewDocument(const string16& document_name) OVERRIDE;
+  virtual Result NewDocument(const base::string16& document_name) OVERRIDE;
   virtual Result NewPage() OVERRIDE;
   virtual Result PageDone() OVERRIDE;
   virtual Result DocumentDone() OVERRIDE;

diff --git a/printing/printing_context_gtk.cc b/printing/printing_context_gtk.cc
@@ -103,7 +103,7 @@ PrintingContext::Result PrintingContextGtk::InitWithSettings(
 }
 
 PrintingContext::Result PrintingContextGtk::NewDocument(
-    const string16& document_name) {
+    const base::string16& document_name) {
   DCHECK(!in_print_job_);
   in_print_job_ = true;
 

diff --git a/printing/printing_context_gtk.h b/printing/printing_context_gtk.h
@@ -42,7 +42,7 @@ class PRINTING_EXPORT PrintingContextGtk : public PrintingContext {
       const base::DictionaryValue& job_settings,
       const PageRanges& ranges) OVERRIDE;
   virtual Result InitWithSettings(const PrintSettings& settings) OVERRIDE;
-  virtual Result NewDocument(const string16& document_name) OVERRIDE;
+  virtual Result NewDocument(const base::string16& document_name) OVERRIDE;
   virtual Result NewPage() OVERRIDE;
   virtual Result PageDone() OVERRIDE;
   virtual Result DocumentDone() OVERRIDE;
@@ -51,7 +51,7 @@ class PRINTING_EXPORT PrintingContextGtk : public PrintingContext {
   virtual gfx::NativeDrawingContext context() const OVERRIDE;
 
  private:
-  string16 document_name_;
+  base::string16 document_name_;
   PrintDialogGtkInterface* print_dialog_;
 
   DISALLOW_COPY_AND_ASSIGN(PrintingContextGtk);

diff --git a/printing/printing_context_mac.h b/printing/printing_context_mac.h
@@ -35,7 +35,7 @@ class PRINTING_EXPORT PrintingContextMac : public PrintingContext {
       const base::DictionaryValue& job_settings,
       const PageRanges& ranges) OVERRIDE;
   virtual Result InitWithSettings(const PrintSettings& settings) OVERRIDE;
-  virtual Result NewDocument(const string16& document_name) OVERRIDE;
+  virtual Result NewDocument(const base::string16& document_name) OVERRIDE;
   virtual Result NewPage() OVERRIDE;
   virtual Result PageDone() OVERRIDE;
   virtual Result DocumentDone() OVERRIDE;

diff --git a/printing/printing_context_mac.mm b/printing/printing_context_mac.mm
@@ -420,7 +420,7 @@ bool IsPaperNameEqual(const PMPaper& paper1, const PMPaper& paper2) {
 }
 
 PrintingContext::Result PrintingContextMac::NewDocument(
-    const string16& document_name) {
+    const base::string16& document_name) {
   DCHECK(!in_print_job_);
 
   in_print_job_ = true;

diff --git a/printing/printing_context_no_system_dialog.cc b/printing/printing_context_no_system_dialog.cc
@@ -104,7 +104,7 @@ PrintingContext::Result PrintingContextNoSystemDialog::InitWithSettings(
 }
 
 PrintingContext::Result PrintingContextNoSystemDialog::NewDocument(
-    const string16& document_name) {
+    const base::string16& document_name) {
   DCHECK(!in_print_job_);
   in_print_job_ = true;
 

diff --git a/printing/printing_context_no_system_dialog.h b/printing/printing_context_no_system_dialog.h
@@ -31,7 +31,7 @@ class PRINTING_EXPORT PrintingContextNoSystemDialog : public PrintingContext {
       const base::DictionaryValue& job_settings,
       const PageRanges& ranges) OVERRIDE;
   virtual Result InitWithSettings(const PrintSettings& settings) OVERRIDE;
-  virtual Result NewDocument(const string16& document_name) OVERRIDE;
+  virtual Result NewDocument(const base::string16& document_name) OVERRIDE;
   virtual Result NewPage() OVERRIDE;
   virtual Result PageDone() OVERRIDE;
   virtual Result DocumentDone() OVERRIDE;

diff --git a/printing/printing_context_win.cc b/printing/printing_context_win.cc
@@ -319,7 +319,7 @@ PrintingContext::Result PrintingContextWin::UpdatePrinterSettings(
   bool is_cloud_dialog;
   int copies;
   int duplex_mode;
-  string16 device_name;
+  base::string16 device_name;
 
   if (!job_settings.GetBoolean(kSettingLandscape, &landscape) ||
       !job_settings.GetBoolean(kSettingCollate, &collate) ||
@@ -456,7 +456,7 @@ PrintingContext::Result PrintingContextWin::InitWithSettings(
 }
 
 PrintingContext::Result PrintingContextWin::NewDocument(
-    const string16& document_name) {
+    const base::string16& document_name) {
   DCHECK(!in_print_job_);
   if (!context_)
     return OnError();

diff --git a/printing/printing_context_win.h b/printing/printing_context_win.h
@@ -33,7 +33,7 @@ class PRINTING_EXPORT PrintingContextWin : public PrintingContext {
       const base::DictionaryValue& job_settings,
       const PageRanges& ranges) OVERRIDE;
   virtual Result InitWithSettings(const PrintSettings& settings) OVERRIDE;
-  virtual Result NewDocument(const string16& document_name) OVERRIDE;
+  virtual Result NewDocument(const base::string16& document_name) OVERRIDE;
   virtual Result NewPage() OVERRIDE;
   virtual Result PageDone() OVERRIDE;
   virtual Result DocumentDone() OVERRIDE;