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

Unified Diff: chrome/browser/ui/views/chrome_web_dialog_view.cc

Issue 11829040: Fix the content_browsertests everywhere maybe. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix SimpleMessageBoxViews asan failure. Created 7 years, 11 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/views/chrome_web_dialog_view.cc
diff --git a/chrome/browser/ui/views/chrome_web_dialog_view.cc b/chrome/browser/ui/views/chrome_web_dialog_view.cc
index cc0a917cf032a5e1433809e60c4cce308b057ee1..c73f6eafe05706917ad25cb37dbe583c12fa0f23 100644
--- a/chrome/browser/ui/views/chrome_web_dialog_view.cc
+++ b/chrome/browser/ui/views/chrome_web_dialog_view.cc
@@ -13,9 +13,21 @@ namespace chrome {
gfx::NativeWindow ShowWebDialog(gfx::NativeWindow parent,
content::BrowserContext* context,
ui::WebDialogDelegate* delegate) {
- views::Widget* widget = views::Widget::CreateWindowWithParent(
- new views::WebDialogView(context, delegate, new ChromeWebContentsHandler),
- parent);
+ views::Widget* widget = NULL;
+ if (parent) {
+ widget = views::Widget::CreateWindowWithParent(
+ new views::WebDialogView(context,
+ delegate,
+ new ChromeWebContentsHandler),
+ parent);
+ } else {
+ // We shouldn't be called with a NULL parent, but sometimes are.
+ widget = views::Widget::CreateWindow(
Ben Goodger (Google) 2013/01/15 18:19:52 This is confusing at first glance due to similarit
+ new views::WebDialogView(context,
+ delegate,
+ new ChromeWebContentsHandler));
+ }
+
widget->Show();
return widget->GetNativeWindow();
}

Powered by Google App Engine
This is Rietveld 408576698