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

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

Issue 11358027: Move constrained web dialog code back to chrome/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: cros fix2 Created 8 years, 1 month 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 f46b65a882fa3c989805c99cc75dfb3b946ddcd3..0cebba55a1cc4856ed8c68f6671ab45657ce8b67 100644
--- a/chrome/browser/ui/webui/certificate_viewer_webui.cc
+++ b/chrome/browser/ui/webui/certificate_viewer_webui.cc
@@ -11,17 +11,18 @@
#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;
@@ -70,14 +71,15 @@ 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 {
« no previous file with comments | « chrome/browser/ui/webui/certificate_viewer_ui.cc ('k') | chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698