Close created HtmlDialogs on closing of the browser that opened them.

BUG=103595
TEST=Open a dialog from a new browser (test incognito browser too), and close that browser. The dialog should close avoiding the use of the invalid profile.


Review URL: http://codereview.chromium.org/9051004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118301 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 7 insertions, 3 deletions

diff --git a/chrome/browser/ui/browser_dialogs.h b/chrome/browser/ui/browser_dialogs.h
index e395ad1..970f272 100644
--- a/chrome/browser/ui/browser_dialogs.h
+++ b/chrome/browser/ui/browser_dialogs.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -36,12 +36,16 @@ void ShowAboutIPCDialog();
 #endif  // IPC_MESSAGE_LOG_ENABLED
 
 // Creates and shows an HTML dialog with the given delegate and profile.
-// The window is automatically destroyed when it is closed.
+// The window is automatically destroyed when it is closed. |browser| can be
+// NULL if the profile used is not incognito, otherwise the window will be
+// closed if the browser is closed.
 // Returns the created window.
 //
 // Make sure to use the returned window only when you know it is safe
 // to do so, i.e. before OnDialogClosed() is called on the delegate.
-gfx::NativeWindow ShowHtmlDialog(gfx::NativeWindow parent, Profile* profile,
+gfx::NativeWindow ShowHtmlDialog(gfx::NativeWindow parent,
+                                 Profile* profile,
+                                 Browser* browser,
                                  HtmlDialogUIDelegate* delegate,
                                  DialogStyle style);