Pass location and description of local printers into print preview.

chrome/browser/ui/webui/print_preview/print_preview_handler.cc

 // Copyright (c) 2012 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/print_preview_handler.h"
 
 #include <ctype.h>
 
 #include <string>
 
@@ skipping 44 matching lines @@
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "content/public/browser/web_ui.h"
 #include "google_apis/gaia/oauth2_token_service.h"
 #include "printing/backend/print_backend.h"
+#include "printing/backend/print_backend_consts.h"
 #include "printing/metafile.h"
 #include "printing/metafile_impl.h"
 #include "printing/pdf_render_settings.h"
 #include "printing/print_settings.h"
 #include "printing/units.h"
 #include "third_party/icu/source/i18n/unicode/ulocdata.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/settings/device_oauth2_token_service.h"
 #include "chrome/browser/chromeos/settings/device_oauth2_token_service_factory.h"
@@ skipping 204 matching lines @@
     base::ListValue* printers) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
 
   VLOG(1) << "Enumerate printers start";
   printing::PrinterList printer_list;
   print_backend->EnumeratePrinters(&printer_list);
 
   for (printing::PrinterList::iterator it = printer_list.begin();
        it != printer_list.end(); ++it) {
     base::DictionaryValue* printer_info = new base::DictionaryValue;
+    printers->Append(printer_info);

[Noam Samuel, 2014/03/28 18:19:31]

Why move this here? IMO this makes what's happening slightly less clear.

[Vitaly Buka (NO REVIEWS), 2014/03/28 18:23:04]

Why?
now it's just created and attached to the dictionary immediately, without a
chance of leaking on continue or return.

[Noam Samuel, 2014/03/28 18:24:10]

Oh, OK. Seems reasonable.

     std::string printer_name;
+    std::string printer_description;
 #if defined(OS_MACOSX)
     // On Mac, |it->printer_description| specifies the printer name and
     // |it->printer_name| specifies the device name / printer queue name.
     printer_name = it->printer_description;
+    if (!it->options[kDriverNameTagName].empty())
+      printer_description = it->options[kDriverNameTagName];
 #else
     printer_name = it->printer_name;
+    printer_description = it->printer_description;
 #endif
+    printer_info->SetString(printing::kSettingDeviceName, it->printer_name);
+    printer_info->SetString(printing::kSettingPrinterDescription,
+                            printer_description);
     printer_info->SetString(printing::kSettingPrinterName, printer_name);
-    printer_info->SetString(printing::kSettingDeviceName, it->printer_name);
     VLOG(1) << "Found printer " << printer_name
             << " with device name " << it->printer_name;
-    printers->Append(printer_info);
+
+    base::DictionaryValue* options = new base::DictionaryValue;
+    printer_info->Set(printing::kSettingPrinterOptions, options);

[Noam Samuel, 2014/03/28 18:19:31]

Ditto

+    for (std::map<std::string, std::string>::iterator opt = it->options.begin();
+         opt != it->options.end(); ++opt) {
+      options->SetString(opt->first, opt->second);
+    }
+
+    VLOG(1) << "Found printer " << printer_name
+      << " with device name " << it->printer_name;

[Aleksey Shlyapnikov, 2014/03/28 20:26:16]

This line should be indented more.

   }
   VLOG(1) << "Enumerate printers finished, found " << printers->GetSize()
           << " printers";
 }
 
 typedef base::Callback<void(const base::DictionaryValue*)>
     GetPrinterCapabilitiesSuccessCallback;
 typedef base::Callback<void(const std::string&)>
     GetPrinterCapabilitiesFailureCallback;
 
@@ skipping 1234 matching lines @@
   printer_value->SetString("name", description.name);
   printer_value->SetBoolean("hasLocalPrinting", has_local_printing);
   printer_value->SetBoolean(
       "isUnregistered",
       description.id.empty() &&
       command_line->HasSwitch(switches::kEnablePrintPreviewRegisterPromos));
   printer_value->SetString("cloudID", description.id);
 }
 
 #endif