chrome/browser/ui/webui/certificate_viewer_webui.cc - Issue 12276010: Factor out uses of the WebContentsModalDialog interface from platform-independent code

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 12276010: Factor out uses of the WebContentsModalDialog interface from platform-independent code (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: remove incorrect override 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

« no previous file with comments | « chrome/browser/ui/views/tab_modal_confirm_dialog_views.cc ('k') | chrome/browser/ui/webui/constrained_web_dialog_delegate_base.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 aebfc0a2e4fd8b2856ba94f190ce390d0c373d0b..cd8d4f159a0a83c4c5e90d3736771654d9fec26e 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/strings/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(

+ NativeWebContentsModalDialog dialog = CreateConstrainedWebDialog(

web_contents->GetBrowserContext(),

this,

NULL,

- web_contents)->GetWindow()->GetNativeDialog();

+ web_contents)->GetNativeDialog();

+ window_ = platform_util::GetTopLevel(dialog);

}

ui::ModalType CertificateViewerDialog::GetDialogModalType() const {