diff options
| author | marja@chromium.org <marja@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-15 12:55:38 +0000 |
|---|---|---|
| committer | marja@chromium.org <marja@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-15 12:55:38 +0000 |
| commit | 604a61037af0a3ebada8c7165144d991b4cb2282 (patch) | |
| tree | 201f9049f7312a9ff795eacf618b5071f3728a27 /chrome/browser/process_singleton_win.cc | |
| parent | 8d6781f6980eb1f53f9a831828ac3a7e47ea78ed (diff) | |
| download | chromium_src-604a61037af0a3ebada8c7165144d991b4cb2282.zip chromium_src-604a61037af0a3ebada8c7165144d991b4cb2282.tar.gz chromium_src-604a61037af0a3ebada8c7165144d991b4cb2282.tar.bz2 | |
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@122079 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/process_singleton_win.cc')
| -rw-r--r-- | chrome/browser/process_singleton_win.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/process_singleton_win.cc b/chrome/browser/process_singleton_win.cc index 4d20415..4272c2c 100644 --- a/chrome/browser/process_singleton_win.cc +++ b/chrome/browser/process_singleton_win.cc @@ -268,7 +268,7 @@ LRESULT ProcessSingleton::OnCopyData(HWND hwnd, const COPYDATASTRUCT* cds) { NOTIMPLEMENTED(); #else // Attempt to place ourselves in the foreground / flash the task bar. - if (IsWindow(foreground_window_)) + if (foreground_window_ != NULL && IsWindow(foreground_window_)) SetForegroundWindow(foreground_window_); #endif return TRUE; |