diff options
| author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-15 08:52:57 +0000 |
|---|---|---|
| committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-15 08:52:57 +0000 |
| commit | 6df23c4e5e5cfdc831fed3939337d2a1caf0ac3d (patch) | |
| tree | 51a1e9d04a7f7e919e8e447ea9d0a04ad84e2699 /chrome/browser/extensions/extension_cookies_helpers.cc | |
| parent | 49c4fe7f7ca455b470db0cb0cfc2a25113ba04eb (diff) | |
| download | chromium_src-6df23c4e5e5cfdc831fed3939337d2a1caf0ac3d.zip chromium_src-6df23c4e5e5cfdc831fed3939337d2a1caf0ac3d.tar.gz chromium_src-6df23c4e5e5cfdc831fed3939337d2a1caf0ac3d.tar.bz2 | |
Do not create an incognito profile if none exists in cookies.getAllCookieStores
BUG=66817
TEST=ExtensionApiTest.DontCreateIncognitoProfile
Review URL: http://codereview.chromium.org/5742011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69240 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_cookies_helpers.cc')
| -rw-r--r-- | chrome/browser/extensions/extension_cookies_helpers.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/extensions/extension_cookies_helpers.cc b/chrome/browser/extensions/extension_cookies_helpers.cc index acd58e6..42e2fae 100644 --- a/chrome/browser/extensions/extension_cookies_helpers.cc +++ b/chrome/browser/extensions/extension_cookies_helpers.cc @@ -30,7 +30,8 @@ Profile* ChooseProfileFromStoreId(const std::string& store_id, bool include_incognito) { DCHECK(profile); bool allow_original = !profile->IsOffTheRecord(); - bool allow_incognito = profile->IsOffTheRecord() || include_incognito; + bool allow_incognito = profile->IsOffTheRecord() || + (include_incognito && profile->HasOffTheRecordProfile()); if (store_id == kOriginalProfileStoreId && allow_original) return profile->GetOriginalProfile(); if (store_id == kOffTheRecordProfileStoreId && allow_incognito) |