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

Unified Diff: printing/print_settings_initializer_gtk.cc

Issue 7967004: printing: Convert some wstrings to string16s. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 9 years, 3 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 | « printing/print_settings.h ('k') | printing/print_settings_initializer_mac.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: printing/print_settings_initializer_gtk.cc
===================================================================
--- printing/print_settings_initializer_gtk.cc (revision 101780)
+++ printing/print_settings_initializer_gtk.cc (working copy)
@@ -7,7 +7,7 @@
#include <gtk/gtk.h>
#include <gtk/gtkprinter.h>
-#include "base/string_piece.h"
+#include "base/string16.h"
#include "base/utf_string_conversions.h"
#include "printing/print_settings.h"
#include "printing/units.h"
@@ -25,10 +25,9 @@
DCHECK(page_setup);
DCHECK(print_settings);
- // TODO(jhawkins): |printer_name_| and |device_name_| should be string16.
- base::StringPiece name(
- reinterpret_cast<const char*>(gtk_print_settings_get_printer(settings)));
- print_settings->set_printer_name(UTF8ToWide(name));
+ string16 name(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());
print_settings->ranges = new_ranges;
print_settings->selection_only = print_selection_only;
« no previous file with comments | « printing/print_settings.h ('k') | printing/print_settings_initializer_mac.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698