Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6005)

Unified Diff: chrome/browser/ui/webui/certificate_viewer_webui.cc

Issue 12224020: Use gfx::NativeView rather than gfx::NativeWindow to identify web contents modal dialogs (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/certificate_viewer_webui.cc
diff --git a/chrome/browser/ui/webui/certificate_viewer_webui.cc b/chrome/browser/ui/webui/certificate_viewer_webui.cc
index b955651addf93a323f52422275f5d4e34bfed9c2..5134cfe12b0f2f911a2e689af3f28386b5c455dc 100644
--- a/chrome/browser/ui/webui/certificate_viewer_webui.cc
+++ b/chrome/browser/ui/webui/certificate_viewer_webui.cc
@@ -11,6 +11,7 @@
#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"
@@ -71,11 +72,12 @@ 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 {

Powered by Google App Engine
This is Rietveld 408576698