Introduce concept of provisional destinations to 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 <map>
 #include <string>
@@ skipping 734 matching lines @@
   EnsureExtensionPrinterHandlerSet();
   // Make sure all in progress requests are canceled before new printer search
   // starts.
   extension_printer_handler_->Reset();
   extension_printer_handler_->StartGetPrinters(base::Bind(
       &PrintPreviewHandler::OnGotPrintersForExtension, base::Unretained(this)));
 }
 
 void PrintPreviewHandler::HandleGrantExtensionUsbPrinterAccess(
     const base::ListValue* args) {
+  std::string provisional_destination_id;
+  bool ok = args->GetString(0, &provisional_destination_id);
+  DCHECK(ok);
   std::string extension_id;
-  bool ok = args->GetString(0, &extension_id);
+  ok = args->GetString(1, &extension_id);
   DCHECK(ok);
   int device_id;
-  ok = args->GetInteger(1, &device_id);
+  ok = args->GetInteger(2, &device_id);
   DCHECK(ok);
 
   EnsureExtensionPrinterHandlerSet();
   extension_printer_handler_->StartGrantUsbPrinterAccess(
       extension_id, device_id,
       base::Bind(&PrintPreviewHandler::OnGotExtensionUsbPrinterInfo,
-                 base::Unretained(this), extension_id, device_id));
+                 base::Unretained(this), provisional_destination_id));
 }
 
 void PrintPreviewHandler::HandleGetExtensionPrinterCapabilities(
     const base::ListValue* args) {
   std::string printer_id;
   bool ok = args->GetString(0, &printer_id);
   DCHECK(ok);
 
   EnsureExtensionPrinterHandlerSet();
   extension_printer_handler_->StartGetCapability(
@@ skipping 935 matching lines @@
 }
 
 void PrintPreviewHandler::OnGotPrintersForExtension(
     const base::ListValue& printers,
     bool done) {
   web_ui()->CallJavascriptFunction("onExtensionPrintersAdded", printers,
                                    base::FundamentalValue(done));
 }
 
 void PrintPreviewHandler::OnGotExtensionUsbPrinterInfo(
-    const std::string& extension_id,
-    int device_id,
+    const std::string& provisional_destination_id,
     const base::DictionaryValue& printer_info) {
   if (printer_info.empty()) {
-    web_ui()->CallJavascriptFunction("failedToGetExtensionUsbPrinterInfo",
-                                     base::StringValue(extension_id),
-                                     base::FundamentalValue(device_id));
+    web_ui()->CallJavascriptFunction(
+        "failedToResolveProvisionalDestination",
+        base::StringValue(provisional_destination_id));
     return;
   }
 
-  web_ui()->CallJavascriptFunction("onExtensionUsbPrinterAdded", printer_info);
+  web_ui()->CallJavascriptFunction(
+    "onProvisionalDestinationResolved",
+    base::StringValue(provisional_destination_id),
+    printer_info);
 }
 
 void PrintPreviewHandler::OnGotExtensionPrinterCapabilities(
     const std::string& printer_id,
     const base::DictionaryValue& capabilities) {
   if (capabilities.empty()) {
     web_ui()->CallJavascriptFunction("failedToGetExtensionPrinterCapabilities",
                                      base::StringValue(printer_id));
     return;
   }
@@ skipping 28 matching lines @@
 
 void PrintPreviewHandler::UnregisterForGaiaCookieChanges() {
   if (gaia_cookie_manager_service_)
     gaia_cookie_manager_service_->RemoveObserver(this);
 }
 
 void PrintPreviewHandler::SetPdfSavedClosureForTesting(
     const base::Closure& closure) {
   pdf_file_saved_closure_ = closure;
 }