Revert 122079 - Revert 122077 - Revert 122065 - Fix attempt for the double-SessionRestoreImpl problem.

The problem is that BrowserInit::ProcessCommandLineAlreadyRunning gets called too
early, before launching the first profile during normal startup.

BUG=111238
TEST=NONE


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

TBR=marja@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9402007

TBR=marja@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9409001

TBR=marja@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9403015

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

1 files changed, 4 insertions, 6 deletions

diff --git a/chrome/browser/first_run/try_chrome_dialog_view.cc b/chrome/browser/first_run/try_chrome_dialog_view.cc
index 71135a7..f1da73d 100644
--- a/chrome/browser/first_run/try_chrome_dialog_view.cc
+++ b/chrome/browser/first_run/try_chrome_dialog_view.cc
@@ -227,14 +227,12 @@ TryChromeDialogView::Result TryChromeDialogView::ShowModal(
   SetToastRegion(popup_->GetNativeView(),
                  preferred.width(), preferred.height());
 
-  // Time to show the window in a modal loop. The ProcessSingleton should
-  // already be locked and it will not process WM_COPYDATA requests. Change the
-  // window to bring to foreground if a request arrives.
-  CHECK(process_singleton->locked());
-  process_singleton->SetForegroundWindow(popup_->GetNativeView());
+  // Time to show the window in a modal loop. We don't want this chrome
+  // instance trying to serve WM_COPYDATA requests, as we'll surely crash.
+  process_singleton->Lock(popup_->GetNativeView());
   popup_->Show();
   MessageLoop::current()->Run();
-  process_singleton->SetForegroundWindow(NULL);
+  process_singleton->Unlock();
   return result_;
 }