diff options
| author | robertshield@google.com <robertshield@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-03 15:57:53 +0000 |
|---|---|---|
| committer | robertshield@google.com <robertshield@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-03 15:57:53 +0000 |
| commit | 175a7a296b06339ee76d59fd8a98507b59aa2187 (patch) | |
| tree | 66bc8cd9dd376252e266b6e7621f6a439f04128a /chrome/browser/browser_main.cc | |
| parent | 537a1e191f7666d12c486a4054abd661b6c1d3a1 (diff) | |
| download | chromium_src-175a7a296b06339ee76d59fd8a98507b59aa2187.zip chromium_src-175a7a296b06339ee76d59fd8a98507b59aa2187.tar.gz chromium_src-175a7a296b06339ee76d59fd8a98507b59aa2187.tar.bz2 | |
Fix multiple instances of first run dialog appearing when Chrome is started again while a first run dialog is visible. Also cause the original first run dialog to come to foreground.
BUG=http://crbug.com/10765
Review URL: http://codereview.chromium.org/99281
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15170 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_main.cc')
| -rw-r--r-- | chrome/browser/browser_main.cc | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc index fd9ee3d..6b27a9d 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -448,11 +448,7 @@ int BrowserMain(const MainFunctionParams& parameters) { // preferences are registered, since some of the code that the importer // touches reads preferences. if (is_first_run && !first_run_ui_bypass) { - // We need to avoid dispatching new tabs when we are doing the import - // because that will lead to data corruption or a crash. Lock() does that. - process_singleton.Lock(); - OpenFirstRunDialog(profile); - process_singleton.Unlock(); + OpenFirstRunDialog(profile, &process_singleton); } // Sets things up so that if we crash from this point on, a dialog will |