Change cloud print dialog style in Aura

chrome/browser/ui/webui/cloud_print_signin_dialog.cc

 // Copyright (c) 2011 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/cloud_print_signin_dialog.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.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/tab_contents/tab_util.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
+#if defined(USE_AURA)
+#include "chrome/browser/ui/browser_window.h"
+#endif
 #include "chrome/browser/ui/dialog_style.h"
+#if defined(USE_AURA)
+#include "chrome/browser/ui/views/html_dialog_view.h"
+#endif
 #include "chrome/browser/ui/webui/html_dialog_ui.h"
 #include "chrome/browser/ui/webui/print_preview_ui.h"
 #include "chrome/common/pref_names.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/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/render_process_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui_message_handler.h"
-
+#if defined(USE_AURA)
+#include "ui/views/widget/widget.h"
+#endif
 using content::BrowserThread;
 using content::NavigationController;
 using content::NavigationEntry;
 using content::WebContents;
 using content::WebUIMessageHandler;
 
 // This module implements a sign in dialog for cloud print.
 // it is based heavily off "chrome/browser/printing/print_dialog_cloud.cc".
 // See the comments in that file for a discussion about how this works.
 
@@ skipping 106 matching lines @@
 void CloudPrintSigninDelegate::GetWebUIMessageHandlers(
       std::vector<WebUIMessageHandler*>* handlers) const {
   handlers->push_back(new CloudPrintSigninFlowHandler(parent_tab_));
 }
 
 void CloudPrintSigninDelegate::GetDialogSize(gfx::Size* size) const {
   PrefService* pref_service =
       BrowserList::GetLastActive()->GetProfile()->GetPrefs();
   if (!pref_service->FindPreference(prefs::kCloudPrintSigninDialogWidth)) {
     pref_service->RegisterIntegerPref(prefs::kCloudPrintSigninDialogWidth,
-                                      800,
+                                      912,

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

Move these into constants, but more likely refactor this value and the
previously commented-on value into a common variable.

                                       PrefService::UNSYNCABLE_PREF);
   }
   if (!pref_service->FindPreference(prefs::kCloudPrintSigninDialogHeight)) {
     pref_service->RegisterIntegerPref(prefs::kCloudPrintSigninDialogHeight,
-                                      600,
+                                      633,
                                       PrefService::UNSYNCABLE_PREF);
   }
 
   size->set_width(
       pref_service->GetInteger(prefs::kCloudPrintSigninDialogWidth));
   size->set_height(
       pref_service->GetInteger(prefs::kCloudPrintSigninDialogHeight));
 }
 
 std::string CloudPrintSigninDelegate::GetDialogArgs() const {
@@ skipping 16 matching lines @@
 void CreateCloudPrintSigninDialogImpl(int render_process_id,
                                       int render_view_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   WebContents* parent_tab =
       tab_util::GetWebContentsByID(render_process_id, render_view_id);
   if (!parent_tab)
     return;
   HtmlDialogUIDelegate* dialog_delegate =
       new CloudPrintSigninDelegate(parent_tab);
-  BrowserList::GetLastActive()->BrowserShowHtmlDialog(dialog_delegate,
-                                                      NULL,
-                                                      STYLE_GENERIC);
+  Browser* browser = BrowserList::GetLastActive();
+#if defined(USE_AURA)
+  HtmlDialogView* html_view =

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

This is the same code as the last file, no?  Needs to be refactored.

+      new HtmlDialogView(browser->GetProfile(), 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
 }
 
 void CreateCloudPrintSigninDialog(WebContents* parent_tab) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(&CreateCloudPrintSigninDialogImpl,
                  parent_tab->GetRenderProcessHost()->GetID(),
                  parent_tab->GetRenderViewHost()->routing_id()));
 }
 }  // namespace cloud_print_signin_dialog