diff options
| author | stevenjb@google.com <stevenjb@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-05 16:43:59 +0000 |
|---|---|---|
| committer | stevenjb@google.com <stevenjb@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-05 16:43:59 +0000 |
| commit | a1ed3c8d69b5e63bb65c9dea31391fd747a7c2a2 (patch) | |
| tree | 41b7bb34c2cffb2155afd632f537978369a6cbd2 /chrome | |
| parent | fe1f879528de8dd8ba5c744f48826229f41e66ae (diff) | |
| download | chromium_src-a1ed3c8d69b5e63bb65c9dea31391fd747a7c2a2.zip chromium_src-a1ed3c8d69b5e63bb65c9dea31391fd747a7c2a2.tar.gz chromium_src-a1ed3c8d69b5e63bb65c9dea31391fd747a7c2a2.tar.bz2 | |
Keep incognito profile active in ChromeOS
BUG=119196
TEST=See issue for crash repro on a ChromeOS device. (Note: also should not crash running with --user-data-dir=/tmp/foo on Linux/Ash).
Review URL: https://chromiumcodereview.appspot.com/9980013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@130945 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/ui/browser_list.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/chrome/browser/ui/browser_list.cc b/chrome/browser/ui/browser_list.cc index 83343de0..1782967 100644 --- a/chrome/browser/ui/browser_list.cc +++ b/chrome/browser/ui/browser_list.cc @@ -40,6 +40,7 @@ #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h" #include "chrome/browser/chromeos/dbus/session_manager_client.h" #include "chrome/browser/chromeos/dbus/update_engine_client.h" +#include "chrome/browser/chromeos/login/user_manager.h" #endif using content::WebContents; @@ -817,8 +818,15 @@ bool BrowserList::IsOffTheRecordSessionActive() { } return false; } + // static bool BrowserList::IsOffTheRecordSessionActiveForProfile(Profile* profile) { +#if defined(OS_CHROMEOS) + // In ChromeOS, we assume that the default profile is always valid, so if + // we are in guest mode, keep the OTR profile active so it won't be deleted. + if (chromeos::UserManager::Get()->IsLoggedInAsGuest()) + return true; +#endif for (BrowserList::const_iterator i = BrowserList::begin(); i != BrowserList::end(); ++i) { if ((*i)->profile()->IsSameProfile(profile) && |