diff options
| author | mirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-20 23:08:32 +0000 |
|---|---|---|
| committer | mirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-20 23:08:32 +0000 |
| commit | d365a681dce7dca73ecbd682529a98b5505e9cdb (patch) | |
| tree | b864186d5ded11018795104e641c5335755f11e4 | |
| parent | aa820b7d82748a02a897f0bfecb588c5e72ab76e (diff) | |
| download | chromium_src-d365a681dce7dca73ecbd682529a98b5505e9cdb.zip chromium_src-d365a681dce7dca73ecbd682529a98b5505e9cdb.tar.gz chromium_src-d365a681dce7dca73ecbd682529a98b5505e9cdb.tar.bz2 | |
Ensure that process_singleton will do the right thing if the default profile has been deleted.
BUG=100951
TEST=see bug report for details of linux test.
Review URL: http://codereview.chromium.org/8345016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106617 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/process_singleton_linux.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/process_singleton_win.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/process_singleton_linux.cc b/chrome/browser/process_singleton_linux.cc index f4808e6..5b122ef 100644 --- a/chrome/browser/process_singleton_linux.cc +++ b/chrome/browser/process_singleton_linux.cc @@ -627,7 +627,7 @@ void ProcessSingleton::LinuxWatcher::HandleMessage( PrefService* prefs = g_browser_process->local_state(); DCHECK(prefs); - Profile* profile = ProfileManager::GetDefaultProfile(); + Profile* profile = ProfileManager::GetLastUsedProfile(); if (!profile) { // We should only be able to get here if the profile already exists and diff --git a/chrome/browser/process_singleton_win.cc b/chrome/browser/process_singleton_win.cc index 42a7659..c99e2de 100644 --- a/chrome/browser/process_singleton_win.cc +++ b/chrome/browser/process_singleton_win.cc @@ -307,7 +307,7 @@ LRESULT ProcessSingleton::OnCopyData(HWND hwnd, const COPYDATASTRUCT* cds) { PrefService* prefs = g_browser_process->local_state(); DCHECK(prefs); - Profile* profile = ProfileManager::GetDefaultProfile(); + Profile* profile = ProfileManager::GetLastUsedProfile(); if (!profile) { // We should only be able to get here if the profile already exists and // has been created. |