Merge 64807 & 64824 - Cloud Print Dialog work

chrome/browser/printing/print_dialog_cloud.cc

 // Copyright (c) 2010 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 "chrome/browser/printing/print_dialog_cloud_internal.h"
 
 #include "app/l10n_util.h"
 #include "base/base64.h"
 #include "base/file_util.h"
 #include "base/json/json_reader.h"
 #include "base/values.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/debugger/devtools_manager.h"
 #include "chrome/browser/dom_ui/dom_ui.h"
 #include "chrome/browser/dom_ui/dom_ui_util.h"
-#include "chrome/browser/dom_ui/html_dialog_ui.h"
+#include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/printing/cloud_print/cloud_print_url.h"
+#include "chrome/browser/profile.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
+#include "chrome/browser/tab_contents/tab_contents_view.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
 #include "chrome/common/notification_source.h"
 #include "chrome/common/notification_type.h"
+#include "chrome/common/pref_names.h"
 #include "chrome/common/render_messages_params.h"
 #include "chrome/common/url_constants.h"
 #include "webkit/glue/webpreferences.h"
 
 #include "grit/generated_resources.h"
 
 // This module implements the UI support in Chrome for cloud printing.
 // This means hosting a dialog containing HTML/JavaScript and using
 // the published cloud print user interface integration APIs to get
 // page setup settings from the dialog contents and provide the
@@ skipping 49 matching lines @@
 // When the dialog contents are finished (by either being cancelled or
 // hitting the print button), the delegate is notified, and responds
 // that the dialog should be closed, at which point things are torn
 // down and released.
 
 // TODO(scottbyer):
 // http://code.google.com/p/chromium/issues/detail?id=44093 The
 // high-level flow (where the PDF data is generated before even
 // bringing up the dialog) isn't what we want.
 
-
 namespace internal_cloud_print_helpers {
 
 bool GetRealOrInt(const DictionaryValue& dictionary,
                   const std::string& path,
                   double* out_value) {
   if (!dictionary.GetReal(path, out_value)) {
     int int_value = 0;
     if (!dictionary.GetInteger(path, &int_value))
       return false;
     *out_value = int_value;
@@ skipping 112 matching lines @@
 // reference to it, so when the task that is calling it finishes and
 // removes it's reference, it goes away.
 void CloudPrintFlowHandler::CancelAnyRunningTask() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (print_data_sender_.get()) {
     print_data_sender_->CancelPrintDataFile();
     print_data_sender_ = NULL;
   }
 }
 
-
 void CloudPrintFlowHandler::RegisterMessages() {
   if (!dom_ui_)
     return;
 
   // TODO(scottbyer) - This is where we will register messages for the
   // UI JS to use.  Needed: Call to update page setup parameters.
   dom_ui_->RegisterMessageCallback(
       "ShowDebugger",
       NewCallback(this, &CloudPrintFlowHandler::HandleShowDebugger));
   dom_ui_->RegisterMessageCallback(
@@ skipping 112 matching lines @@
     return;
   }
 
   // TODO(scottbyer) - Here is where we would kick the originating
   // renderer thread with these new parameters in order to get it to
   // re-generate the PDF and hand it back to us.  window.print() is
   // currently synchronous, so there's a lot of work to do to get to
   // that point.
 }
 
+void CloudPrintFlowHandler::StoreDialogClientSize() const {
+  if (dom_ui_ && dom_ui_->tab_contents() && dom_ui_->tab_contents()->view()) {
+    gfx::Size size = dom_ui_->tab_contents()->view()->GetContainerSize();
+    dom_ui_->GetProfile()->GetPrefs()->SetInteger(
+        prefs::kCloudPrintDialogWidth, size.width());
+    dom_ui_->GetProfile()->GetPrefs()->SetInteger(
+        prefs::kCloudPrintDialogHeight, size.height());
+  }
+}
+
 CloudPrintHtmlDialogDelegate::CloudPrintHtmlDialogDelegate(
     const FilePath& path_to_pdf,
     int width, int height,
     const std::string& json_arguments,
     const string16& print_job_title)
     : flow_handler_(new CloudPrintFlowHandler(path_to_pdf, print_job_title)),
       owns_flow_handler_(true) {
   Init(width, height, json_arguments);
 }
 
@@ skipping 27 matching lines @@
   if (owns_flow_handler_) {
     delete flow_handler_;
   }
 }
 
 bool CloudPrintHtmlDialogDelegate::IsDialogModal() const {
   return true;
 }
 
 std::wstring CloudPrintHtmlDialogDelegate::GetDialogTitle() const {
-  return l10n_util::GetString(IDS_CLOUD_PRINT_TITLE);
+  return std::wstring();
 }
 
 GURL CloudPrintHtmlDialogDelegate::GetDialogContentURL() const {
   return params_.url;
 }
 
 void CloudPrintHtmlDialogDelegate::GetDOMMessageHandlers(
     std::vector<DOMMessageHandler*>* handlers) const {
   handlers->push_back(flow_handler_);
   // We don't own flow_handler_ anymore, but it sticks around until at
   // least right after OnDialogClosed() is called (and this object is
   // destroyed).
   owns_flow_handler_ = false;
 }
 
 void CloudPrintHtmlDialogDelegate::GetDialogSize(gfx::Size* size) const {
   size->set_width(params_.width);
   size->set_height(params_.height);
 }
 
 std::string CloudPrintHtmlDialogDelegate::GetDialogArgs() const {
   return params_.json_input;
 }
 
 void CloudPrintHtmlDialogDelegate::OnDialogClosed(
     const std::string& json_retval) {
+  // Get the final dialog size and store it.
+  flow_handler_->StoreDialogClientSize();
   delete this;
 }
 
 void CloudPrintHtmlDialogDelegate::OnCloseContents(TabContents* source,
                                                    bool* out_close_dialog) {
   if (out_close_dialog)
     *out_close_dialog = true;
 }
 
+bool CloudPrintHtmlDialogDelegate::ShouldShowDialogTitle() const {
+  return false;
+}
+
 }  // end of namespace internal_cloud_print_helpers
 
 // static, called on the IO thread.  This is the main entry point into
 // creating the dialog.
 
 // TODO(scottbyer): The signature here will need to change as the
 // workflow through the printing code changes to allow for dynamically
 // changing page setup parameters while the dialog is active.
 void PrintDialogCloud::CreatePrintDialogForPdf(const FilePath& path_to_pdf) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
@@ skipping 12 matching lines @@
 // Initialize the print dialog.  Called on the UI thread.
 PrintDialogCloud::PrintDialogCloud(const FilePath& path_to_pdf)
     : browser_(BrowserList::GetLastActive()) {
 
   // TODO(scottbyer): Verify GAIA login valid, execute GAIA login if not (should
   // be distilled out of bookmark sync.)
   string16 print_job_title;
   if (browser_ && browser_->GetSelectedTabContents())
     print_job_title = browser_->GetSelectedTabContents()->GetTitle();
 
-  // TODO(scottbyer): Get the dialog width, height from the dialog
-  // contents, and take the screen size into account.
+  const int kDefaultWidth = 497;
+  const int kDefaultHeight = 332;
+
+  PrefService* pref_service = browser_->GetProfile()->GetPrefs();
+  DCHECK(pref_service);
+  if (!pref_service->FindPreference(prefs::kCloudPrintDialogWidth)) {
+    pref_service->RegisterIntegerPref(prefs::kCloudPrintDialogWidth,
+                                      kDefaultWidth);
+  }
+  if (!pref_service->FindPreference(prefs::kCloudPrintDialogHeight)) {
+    pref_service->RegisterIntegerPref(prefs::kCloudPrintDialogHeight,
+                                      kDefaultHeight);
+  }
+
+  int width = pref_service->GetInteger(prefs::kCloudPrintDialogWidth);
+  int height = pref_service->GetInteger(prefs::kCloudPrintDialogHeight);
   HtmlDialogUIDelegate* dialog_delegate =
       new internal_cloud_print_helpers::CloudPrintHtmlDialogDelegate(
-          path_to_pdf, 500, 400, std::string(), print_job_title);
+          path_to_pdf, width, height, std::string(), print_job_title);
   browser_->BrowserShowHtmlDialog(dialog_delegate, NULL);
 }
 
 PrintDialogCloud::~PrintDialogCloud() {
 }