Revert 100233 - PrintPreview: Added code to identify the printer default duplex value.

chrome/browser/ui/webui/print_preview_handler.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/print_preview_handler.h"
 
 #include <string>
 
 #include "base/base64.h"
 #if !defined(OS_CHROMEOS)
@@ skipping 41 matching lines @@
 
 #include "base/file_util.h"
 #endif
 
 namespace {
 
 const char kDisableColorOption[] = "disableColorOption";
 const char kSetColorAsDefault[] = "setColorAsDefault";
 const char kSetDuplexAsDefault[] = "setDuplexAsDefault";
 const char kPrinterColorModelForColor[] = "printerColorModelForColor";
-const char kPrinterDefaultDuplexValue[] = "printerDefaultDuplexValue";
 
 #if defined(USE_CUPS)
 const char kColorDevice[] = "ColorDevice";
 const char kColorModel[] = "ColorModel";
 const char kColorModelForColor[] = "Color";
 const char kCMYK[] = "CMYK";
 const char kDuplex[] = "Duplex";
 const char kDuplexNone[] = "None";
 #elif defined(OS_WIN)
 const char kPskColor[] = "psk:Color";
@@ skipping 202 matching lines @@
     }
     delete printers;
   }
 
   void GetPrinterCapabilities(const std::string& printer_name) {
     VLOG(1) << "Get printer capabilities start for " << printer_name;
     printing::PrinterCapsAndDefaults printer_info;
     bool supports_color = true;
     bool set_duplex_as_default = false;
     int printer_color_space = printing::GRAY;
-    int default_duplex_setting_value = printing::UNKNOWN_DUPLEX_MODE;
     if (!print_backend_->GetPrinterCapsAndDefaults(printer_name,
                                                    &printer_info)) {
       return;
     }
 
 #if defined(USE_CUPS)
     FilePath ppd_file_path;
     if (!file_util::CreateTemporaryFile(&ppd_file_path))
       return;
 
     int data_size = printer_info.printer_capabilities.length();
     if (data_size != file_util::WriteFile(
                          ppd_file_path,
                          printer_info.printer_capabilities.data(),
                          data_size)) {
       file_util::Delete(ppd_file_path, false);
       return;
     }
 
     ppd_file_t* ppd = ppdOpenFile(ppd_file_path.value().c_str());
     if (ppd) {
       ppd_attr_t* attr = ppdFindAttr(ppd, kColorDevice, NULL);
       if (attr && attr->value)
         supports_color = ppd->color_device;
 
-      ppd_choice_t* duplex_choice = ppdFindMarkedChoice(ppd, kDuplex);
-      if (duplex_choice == NULL) {
+      ppd_choice_t* ch = ppdFindMarkedChoice(ppd, kDuplex);
+      if (ch == NULL) {
         ppd_option_t* option = ppdFindOption(ppd, kDuplex);
         if (option != NULL)
-          duplex_choice = ppdFindChoice(option, option->defchoice);
+          ch = ppdFindChoice(option, option->defchoice);
       }
 
-      if (duplex_choice != NULL &&
-          strcmp(duplex_choice->choice, kDuplexNone) != 0)
+      if (ch != NULL && strcmp(ch->choice, kDuplexNone) != 0)
         set_duplex_as_default = true;
 
-      if (duplex_choice != NULL) {
-        if (strcmp(duplex_choice->choice, kDuplexNone) != 0)
-          default_duplex_setting_value = printing::LONG_EDGE;
-        else
-          default_duplex_setting_value = printing::SIMPLEX;
-      }
-
       if (supports_color) {
         // Identify the color space (COLOR/CMYK) for this printer.
         ppd_option_t* color_model = ppdFindOption(ppd, kColorModel);
         if (color_model != NULL) {
           if (ppdFindChoice(color_model, kColorModelForColor))
             printer_color_space = printing::COLOR;
           else if (ppdFindChoice(color_model, kCMYK))
             printer_color_space = printing::CMYK;
         }
       }
+
       ppdClose(ppd);
     }
     file_util::Delete(ppd_file_path, false);
 #elif defined(OS_WIN)
     // According to XPS 1.0 spec, only color printers have psk:Color.
     // Therefore we don't need to parse the whole XML file, we just need to
     // search the string.  The spec can be found at:
     // http://msdn.microsoft.com/en-us/windows/hardware/gg463431.
     supports_color = (printer_info.printer_capabilities.find(kPskColor) !=
                       std::string::npos);
     if (supports_color)
       printer_color_space = printing::COLOR;
 
     set_duplex_as_default =
         (printer_info.printer_defaults.find(kPskDuplexFeature) !=
             std::string::npos) &&
         (printer_info.printer_defaults.find(kPskTwoSided) !=
             std::string::npos);
-
-    if (printer_info.printer_defaults.find(kPskDuplexFeature) !=
-            std::string::npos) {
-        if (printer_info.printer_defaults.find(kPskTwoSided) !=
-                std::string::npos) {
-          default_duplex_setting_value = printing::LONG_EDGE;
-        } else {
-          default_duplex_setting_value = printing::SIMPLEX;
-        }
-    }
 #else
   NOTIMPLEMENTED();
 #endif
 
     DictionaryValue settings_info;
     settings_info.SetBoolean(kDisableColorOption, !supports_color);
     if (!supports_color) {
       settings_info.SetBoolean(kSetColorAsDefault, false);
     } else {
        settings_info.SetBoolean(kSetColorAsDefault,
                                 PrintPreviewHandler::last_used_color_setting_);
     }
     settings_info.SetBoolean(kSetDuplexAsDefault, set_duplex_as_default);
     settings_info.SetInteger(kPrinterColorModelForColor, printer_color_space);
-    settings_info.SetInteger(kPrinterDefaultDuplexValue,
-                             default_duplex_setting_value);
     BrowserThread::PostTask(
         BrowserThread::UI, FROM_HERE,
         NewRunnableMethod(this,
                           &PrintSystemTaskProxy::SendPrinterCapabilities,
                           settings_info.DeepCopy()));
   }
 
   void SendPrinterCapabilities(DictionaryValue* settings_info) {
     if (handler_)
       handler_->SendPrinterCapabilities(*settings_info);
@@ skipping 626 matching lines @@
     return;
 
   // We no longer require the initiator tab details. Remove those details
   // associated with the preview tab to allow the initiator tab to create
   // another preview tab.
   printing::PrintPreviewTabController* tab_controller =
       printing::PrintPreviewTabController::GetInstance();
   if (tab_controller)
     tab_controller->EraseInitiatorTabInfo(preview_tab_wrapper());
 }