Change cloud print dialog style in Aura

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 "chrome/browser/printing/print_dialog_cloud_internal.h"
 
 #include "base/base64.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/json/json_reader.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process_impl.h"
 #include "chrome/browser/debugger/devtools_window.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/printing/cloud_print/cloud_print_url.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser_dialogs.h"
 #include "chrome/browser/ui/browser_list.h"
+#if defined(USE_AURA)

[James Hawkins, 2012/01/11 17:25:54]

OS-specific includes go after the cross-platform includes.

[Albert Bodenhamer, 2012/01/11 18:11:44]

Done.

+#include "chrome/browser/ui/browser_window.h"
+#endif
 #include "chrome/browser/ui/dialog_style.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
+#if defined(USE_AURA)
+#include "chrome/browser/ui/views/html_dialog_view.h"
+#endif
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/print_messages.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/tab_contents/tab_contents_view.h"
 #include "content/browser/webui/web_ui.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/notification_registrar.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/web_contents.h"
 #include "ui/base/l10n/l10n_util.h"
+#if defined(USE_AURA)
+#include "ui/views/widget/widget.h"
+#endif
 #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
 // generated print data to the dialog contents for uploading to the
 // cloud print service.
@@ skipping 542 matching lines @@
 // Called from the UI thread, starts up the dialog.
 void CreateDialogImpl(const FilePath& path_to_file,
                       const string16& print_job_title,
                       const string16& print_ticket,
                       const std::string& file_type,
                       bool modal,
                       bool delete_on_close) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   Browser* browser = BrowserList::GetLastActive();
 
-  const int kDefaultWidth = 497;
-  const int kDefaultHeight = 332;
+  const int kDefaultWidth = 912;

[James Hawkins, 2012/01/11 17:25:54]

What is this change about?

[Albert Bodenhamer, 2012/01/11 18:11:44]

The sign-in dialog has gotten much larger since these values were initially set.
 Since I was changing the dialog style I addressed the size issue at the same
time.

In retrospect it should be a separate change, so I've reverted it.

+  const int kDefaultHeight = 633;
   string16 job_title = print_job_title;
   Profile* profile = NULL;
   if (modal) {
     if (job_title.empty()) {
       WebContents* web_contents = browser->GetSelectedWebContents();
       if (web_contents)
         job_title = web_contents->GetTitle();
     }
     profile = browser->GetProfile();
   } else {
@@ skipping 18 matching lines @@
 
   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_file, width, height, std::string(), job_title, print_ticket,
           file_type, modal, delete_on_close);
   if (modal) {
     DCHECK(browser);
+#if defined(USE_AURA)
+    HtmlDialogView* html_view =
+        new HtmlDialogView(profile, dialog_delegate);
+    views::Widget::CreateWindowWithParent(html_view,
+        browser->window()->GetNativeHandle());
+    html_view->InitDialog();
+    html_view->GetWidget()->Show();
+#else
     browser->BrowserShowHtmlDialog(dialog_delegate, NULL, STYLE_GENERIC);
+#endif
   } else {
     browser::ShowHtmlDialog(NULL, profile, dialog_delegate, STYLE_GENERIC);
   }
 }
 
 // Provides a runnable function to delete a file.
 void Delete(const FilePath& file_path) {
   file_util::Delete(file_path, false);
 }
 
@@ skipping 72 matching lines @@
                                                    file_type,
                                                    false,
                                                    delete_on_close);
       return true;
     }
   }
   return false;
 }
 
 }  // end namespace