Use gfx::NativeView rather than gfx::NativeWindow to identify web contents modal dialogs

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/platform_util.h"
 #include "chrome/browser/ui/browser_dialogs.h"
 #include "chrome/browser/ui/certificate_dialogs.h"
 #include "chrome/browser/ui/web_contents_modal_dialog.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"
@@ skipping 40 matching lines @@
       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 adding padding
   // on the title for Aura ConstrainedWebDialogUI.
-  window_ = CreateConstrainedWebDialog(
+  gfx::NativeView view = CreateConstrainedWebDialog(
       web_contents->GetBrowserContext(),
       this,
       NULL,
-      web_contents)->GetWindow()->GetNativeWindow();
+      web_contents)->GetWindow()->GetNativeView();
+  window_ = platform_util::GetTopLevel(view);
 }
 
 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;
 }