Removed unused PrintSettings::printer_name_.

TBR=gene Review URL: https://codereview.chromium.org/47413002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@231265 0039d316-1c4b-4281-b951-d872f2087c98
Denger-Network · Oct 27, 2013 · 43a0390 · 43a0390
1 parent 1a24c6d
commit 43a0390
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 13 deletions.
diff --git a/printing/print_settings.cc b/printing/print_settings.cc
@@ -135,7 +135,6 @@ void PrintSettings::Clear() {
   title = base::string16();
   url = base::string16();
   display_header_footer = false;
-  printer_name_.clear();
   device_name_.clear();
   page_setup_device_units_.Clear();
   dpi_ = 0;

diff --git a/printing/print_settings.h b/printing/print_settings.h
@@ -48,10 +48,6 @@ class PRINTING_EXPORT PrintSettings {
   bool Equals(const PrintSettings& rhs) const;
 
   void set_landscape(bool landscape) { landscape_ = landscape; }
-  void set_printer_name(const base::string16& printer_name) {
-    printer_name_ = printer_name;
-  }
-  const base::string16& printer_name() const { return printer_name_; }
   void set_device_name(const base::string16& device_name) {
     device_name_ = device_name;
   }
@@ -122,9 +118,6 @@ class PRINTING_EXPORT PrintSettings {
   //////////////////////////////////////////////////////////////////////////////
   // Settings that can't be changed without side-effects.
 
-  // Printer name as shown to the user.
-  base::string16 printer_name_;
-
   // Printer device name as opened by the OS.
   base::string16 device_name_;
 

diff --git a/printing/print_settings_initializer_gtk.cc b/printing/print_settings_initializer_gtk.cc
@@ -27,8 +27,7 @@ void PrintSettingsInitializerGtk::InitPrintSettings(
 
   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());
+  print_settings->set_device_name(name);
   print_settings->ranges = new_ranges;
   print_settings->selection_only = print_selection_only;
 

diff --git a/printing/print_settings_initializer_mac.cc b/printing/print_settings_initializer_mac.cc
@@ -18,8 +18,6 @@ void PrintSettingsInitializerMac::InitPrintSettings(
     PrintSettings* print_settings) {
   DCHECK(print_settings);
 
-  print_settings->set_printer_name(
-      base::SysCFStringRefToUTF16(PMPrinterGetName(printer)));
   print_settings->set_device_name(
       base::SysCFStringRefToUTF16(PMPrinterGetID(printer)));
   print_settings->ranges = new_ranges;

diff --git a/printing/print_settings_initializer_win.cc b/printing/print_settings_initializer_win.cc
@@ -21,7 +21,6 @@ void PrintSettingsInitializerWin::InitPrintSettings(
   DCHECK(hdc);
   DCHECK(print_settings);
 
-  print_settings->set_printer_name(dev_mode.dmDeviceName);
   print_settings->set_device_name(new_device_name);
   print_settings->ranges = const_cast<PageRanges&>(new_ranges);
   print_settings->set_landscape(dev_mode.dmOrientation == DMORIENT_LANDSCAPE);