Merge 199109 "Make cloud print dialog work with cloud printer on..."

chrome/browser/printing/print_dialog_cloud.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/printing/print_dialog_cloud.h"
 
 
 #include "base/base64.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 203 matching lines @@
 void CloudPrintDataSender::SendPrintData() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   if (!data_ || !data_->size())
     return;
 
   std::string base64_data;
   base::Base64Encode(
       base::StringPiece(reinterpret_cast<const char*>(data_->front()),
                         data_->size()),
       &base64_data);
-  data_ = NULL;
   std::string header("data:");
   header.append(file_type_);
   header.append(";base64,");
   base64_data.insert(0, header);
 
   base::AutoLock lock(lock_);
   if (helper_) {
     StringValue title(print_job_title_);
     StringValue ticket(print_ticket_);
     // TODO(abodenha): Change Javascript call to pass in print ticket
@@ skipping 90 matching lines @@
     const content::NotificationDetails& details) {
   switch (type) {
     case content::NOTIFICATION_NAV_ENTRY_COMMITTED: {
       NavigationEntry* entry =
           web_ui()->GetWebContents()->GetController().GetActiveEntry();
       if (entry)
         NavigationToURLDidCloseDialog(entry->GetURL());
       break;
     }
     case content::NOTIFICATION_LOAD_STOP: {
-      // Take the opportunity to set some (minimal) additional
-      // script permissions required for the web UI.
       GURL url = web_ui()->GetWebContents()->GetURL();
-      GURL dialog_url = CloudPrintURL(
-          Profile::FromWebUI(web_ui())).GetCloudPrintServiceDialogURL();
-      if (url.host() == dialog_url.host() &&
-          url.path() == dialog_url.path() &&
-          url.scheme() == dialog_url.scheme()) {
+      if (IsCloudPrintDialogUrl(url)) {
+        // Take the opportunity to set some (minimal) additional
+        // script permissions required for the web UI.
         RenderViewHost* rvh = web_ui()->GetWebContents()->GetRenderViewHost();
         if (rvh) {
           WebPreferences webkit_prefs = rvh->GetWebkitPreferences();
           webkit_prefs.allow_scripts_to_close_windows = true;
           rvh->UpdateWebkitPreferences(webkit_prefs);
         } else {
           NOTREACHED();
         }
+        // Choose one or the other.  If you need to debug, bring up the
+        // debugger.  You can then use the various chrome.send()
+        // registrations above to kick of the various function calls,
+        // including chrome.send("SendPrintData") in the javaScript
+        // console and watch things happen with:
+        // HandleShowDebugger(NULL);
+        HandleSendPrintData(NULL);
       }
-
-      // Choose one or the other.  If you need to debug, bring up the
-      // debugger.  You can then use the various chrome.send()
-      // registrations above to kick of the various function calls,
-      // including chrome.send("SendPrintData") in the javaScript
-      // console and watch things happen with:
-      // HandleShowDebugger(NULL);
-      HandleSendPrintData(NULL);
       break;
     }
   }
 }
 
 void CloudPrintFlowHandler::HandleShowDebugger(const ListValue* args) {
   ShowDebugger();
 }
 
 void CloudPrintFlowHandler::ShowDebugger() {
   if (web_ui()) {
     RenderViewHost* rvh = web_ui()->GetWebContents()->GetRenderViewHost();
     if (rvh)
       DevToolsWindow::OpenDevToolsWindow(rvh);
   }
 }
 
 scoped_refptr<CloudPrintDataSender>
 CloudPrintFlowHandler::CreateCloudPrintDataSender() {
   DCHECK(web_ui());
   print_data_helper_.reset(new CloudPrintDataSenderHelper(web_ui()));
   scoped_refptr<CloudPrintDataSender> sender(
       new CloudPrintDataSender(print_data_helper_.get(), print_job_title_,
                                print_ticket_, file_type_, data_));
-  data_ = NULL;
   return sender;
 }
 
 void CloudPrintFlowHandler::HandleSendPrintData(const ListValue* args) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   // This will cancel any ReadPrintDataFile() or SendPrintDataFile()
   // requests in flight (this is anticipation of when setting page
   // setup parameters becomes asynchronous and may be set while some
   // data is in flight).  Then we can clear out the print data.
   CancelAnyRunningTask();
@@ skipping 59 matching lines @@
     Profile* profile = Profile::FromWebUI(web_ui());
     profile->GetPrefs()->SetInteger(prefs::kCloudPrintDialogWidth,
                                     size.width());
     profile->GetPrefs()->SetInteger(prefs::kCloudPrintDialogHeight,
                                     size.height());
   }
 }
 
 bool CloudPrintFlowHandler::NavigationToURLDidCloseDialog(const GURL& url) {
   if (close_after_signin_) {
-    GURL dialog_url = CloudPrintURL(
-        Profile::FromWebUI(web_ui())).GetCloudPrintServiceURL();
-
-    if (url.host() == dialog_url.host() &&
-        StartsWithASCII(url.path(), dialog_url.path(), false) &&
-        url.scheme() == dialog_url.scheme()) {
+    if (IsCloudPrintDialogUrl(url)) {
       StoreDialogClientSize();
       web_ui()->GetWebContents()->GetRenderViewHost()->ClosePage();
       callback_.Run();
       return true;
     }
   }
   return false;
 }
 
+bool CloudPrintFlowHandler::IsCloudPrintDialogUrl(const GURL& url) {
+  GURL cloud_print_url =
+      CloudPrintURL(Profile::FromWebUI(web_ui())).GetCloudPrintServiceURL();
+  return url.host() == cloud_print_url.host() &&
+         StartsWithASCII(url.path(), cloud_print_url.path(), false) &&
+         url.scheme() == cloud_print_url.scheme();
+}
+
 CloudPrintWebDialogDelegate::CloudPrintWebDialogDelegate(
     content::BrowserContext* browser_context,
     gfx::NativeWindow modal_parent,
     const base::RefCountedMemory* data,
     const std::string& json_arguments,
     const string16& print_job_title,
     const string16& print_ticket,
     const std::string& file_type,
     bool close_after_signin,
     const base::Closure& callback)
@@ skipping 290 matching lines @@
           print_job_print_ticket,
           file_type,
           delete_on_close);
       return true;
     }
   }
   return false;
 }
 
 }  // end namespace