diff options
author | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-13 19:39:19 +0000 |
---|---|---|
committer | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-13 19:39:19 +0000 |
commit | d9d42998427a6204ddbc5929acc5e4c13c939b07 (patch) | |
tree | 48f4193243f2bb2a08ae59f474b20b38ce5c6e93 /printing/printed_document.h | |
parent | 609706121877c28ca2a80c7810e63a47e68806e3 (diff) | |
download | chromium_src-d9d42998427a6204ddbc5929acc5e4c13c939b07.zip chromium_src-d9d42998427a6204ddbc5929acc5e4c13c939b07.tar.gz chromium_src-d9d42998427a6204ddbc5929acc5e4c13c939b07.tar.bz2 |
Printing: Convert several wstrings to string16.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/3292019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59262 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'printing/printed_document.h')
-rw-r--r-- | printing/printed_document.h | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/printing/printed_document.h b/printing/printed_document.h index 752c1c3..e4a3280 100644 --- a/printing/printed_document.h +++ b/printing/printed_document.h @@ -10,11 +10,13 @@ #include "base/lock.h" #include "base/ref_counted.h" #include "base/scoped_ptr.h" +#include "base/string16.h" #include "gfx/native_widget_types.h" #include "googleurl/src/gurl.h" #include "printing/print_settings.h" #include "printing/native_metafile.h" +class FilePath; class MessageLoop; namespace gfx { @@ -92,19 +94,19 @@ class PrintedDocument : public base::RefCountedThreadSafe<PrintedDocument> { // Getters. All these items are immutable hence thread-safe. const PrintSettings& settings() const { return immutable_.settings_; } - const std::wstring& name() const { + const string16& name() const { return immutable_.name_; } const GURL& url() const { return immutable_.url_; } - const std::wstring& date() const { return immutable_.date_; } - const std::wstring& time() const { return immutable_.time_; } + const string16& date() const { return immutable_.date_; } + const string16& time() const { return immutable_.time_; } int cookie() const { return immutable_.cookie_; } // Sets a path where to dump printing output files for debugging. If never set // no files are generated. - static void set_debug_dump_path(const std::wstring& debug_dump_path); + static void set_debug_dump_path(const FilePath& debug_dump_path); - static const std::wstring& debug_dump_path(); + static const FilePath& debug_dump_path(); private: friend class base::RefCountedThreadSafe<PrintedDocument>; @@ -152,16 +154,16 @@ class PrintedDocument : public base::RefCountedThreadSafe<PrintedDocument> { MessageLoop* source_message_loop_; // Document name. Immutable. - std::wstring name_; + string16 name_; // URL that generated this document. Immutable. GURL url_; // The date on which this job started. Immutable. - std::wstring date_; + string16 date_; // The time at which this job started. Immutable. - std::wstring time_; + string16 time_; // Cookie to uniquely identify this document. It is used to make sure that a // PrintedPage is correctly belonging to the PrintedDocument. Since |