summaryrefslogtreecommitdiffstats
path: root/chrome/browser/views/html_dialog_view.cc
diff options
context:
space:
mode:
authornkostylev@google.com <nkostylev@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-13 06:42:38 +0000
committernkostylev@google.com <nkostylev@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-13 06:42:38 +0000
commitc04ec03c76f5d6f86605103d98f1608b59c8cc7f (patch)
tree84313233f04fd533f80d94886c2c6a550e055cdb /chrome/browser/views/html_dialog_view.cc
parent1229f0b556f09ee6997684d5e6f799cf15228bb4 (diff)
downloadchromium_src-c04ec03c76f5d6f86605103d98f1608b59c8cc7f.zip
chromium_src-c04ec03c76f5d6f86605103d98f1608b59c8cc7f.tar.gz
chromium_src-c04ec03c76f5d6f86605103d98f1608b59c8cc7f.tar.bz2
Fix crash when opening "Select certificate file" in OOBE.
Pass default profile and correct top window in OOBE. BUG=http://crosbug.com/2978 TEST=On welcome screen select encrypted 802.1X network and open "select certificate" dialog. It should open withot crash. Review URL: http://codereview.chromium.org/2053001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47125 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/html_dialog_view.cc')
-rw-r--r--chrome/browser/views/html_dialog_view.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/views/html_dialog_view.cc b/chrome/browser/views/html_dialog_view.cc
index ccf1423..68a2c80 100644
--- a/chrome/browser/views/html_dialog_view.cc
+++ b/chrome/browser/views/html_dialog_view.cc
@@ -14,10 +14,10 @@
namespace browser {
// Declared in browser_dialogs.h so that others don't need to depend on our .h.
-void ShowHtmlDialogView(gfx::NativeWindow parent, Browser* browser,
+void ShowHtmlDialogView(gfx::NativeWindow parent, Profile* profile,
HtmlDialogUIDelegate* delegate) {
HtmlDialogView* html_view =
- new HtmlDialogView(browser->profile(), delegate);
+ new HtmlDialogView(profile, delegate);
views::Window::CreateChromeWindow(parent, gfx::Rect(), html_view);
html_view->InitDialog();
html_view->window()->Show();