Move constrained web dialog code back to chrome/.

chrome/browser/ui/webui/certificate_viewer_webui.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/certificate_viewer_webui.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/i18n/time_formatting.h"
 #include "base/json/json_writer.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/certificate_viewer.h"
+#include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_dialogs.h"
 #include "chrome/browser/ui/certificate_dialogs.h"
 #include "chrome/browser/ui/constrained_window.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
+#include "chrome/browser/ui/webui/constrained_web_dialog_ui.h"
 #include "chrome/common/net/x509_certificate_model.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/size.h"
-#include "ui/web_dialogs/constrained_web_dialog_ui.h"
 #include "ui/web_dialogs/web_dialog_observer.h"
 
 using content::WebContents;
 using content::WebUIMessageHandler;
 using ui::WebDialogObserver;
 
 namespace {
 
 // Default width/height of the dialog.
 const int kDefaultWidth = 580;
@@ skipping 28 matching lines @@
       &cert_chain);
   title_ = l10n_util::GetStringFUTF16(IDS_CERT_INFO_DIALOG_TITLE,
       UTF8ToUTF16(x509_certificate_model::GetTitle(cert_chain.front())));
 }
 
 CertificateViewerDialog::~CertificateViewerDialog() {
 }
 
 void CertificateViewerDialog::Show(WebContents* web_contents,
                                    gfx::NativeWindow parent) {
-  // TODO(bshe): UI tweaks needed for AURA html Dialog, such as add padding on
-  // title for AURA ConstrainedWebDialogUI.
-  TabContents* tab = TabContents::FromWebContents(web_contents);
-  window_ = ui::CreateConstrainedWebDialog(
-      tab->profile(),
+  // TODO(bshe): UI tweaks needed for Aura HTML Dialog, such as adding padding
+  // on the title for Aura ConstrainedWebDialogUI.
+  Profile* profile =
+      Profile::FromBrowserContext(web_contents->GetBrowserContext());
+  window_ = CreateConstrainedWebDialog(
+      profile,
       this,
       NULL,
-      tab)->window()->GetNativeWindow();
+      web_contents)->window()->GetNativeWindow();
 }
 
 ui::ModalType CertificateViewerDialog::GetDialogModalType() const {
   return ui::MODAL_TYPE_NONE;
 }
 
 string16 CertificateViewerDialog::GetDialogTitle() const {
   return title_;
 }
 
@@ skipping 314 matching lines @@
     const base::ListValue* args) const {
   int cert_index;
   double val;
   if (!(args->GetDouble(0, &val)))
     return -1;
   cert_index = static_cast<int>(val);
   if (cert_index < 0 || cert_index >= static_cast<int>(cert_chain_.size()))
     return -1;
   return cert_index;
 }