chrome/browser/extensions/extension_pref_value_map.cc - Issue 10559052: Split mode incognito extension can get misleading pref changed events from regular mode

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/extensions/extension_pref_value_map.cc

Issue 10559052: Split mode incognito extension can get misleading pref changed events from regular mode (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Fixed some callbacks, other nits Created 8 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/extensions/extension_pref_value_map.h ('k') | chrome/browser/extensions/extension_pref_value_map_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/extension_pref_value_map.cc

diff --git a/chrome/browser/extensions/extension_pref_value_map.cc b/chrome/browser/extensions/extension_pref_value_map.cc

index 2965471826ee4f19d1599a67b19d5e1ce4cd088b..18586e06356ee9bed6180b76cfc565c0aa0262cd 100644

--- a/chrome/browser/extensions/extension_pref_value_map.cc

+++ b/chrome/browser/extensions/extension_pref_value_map.cc

@@ -102,9 +102,10 @@ void ExtensionPrefValueMap::ClearAllIncognitoSessionOnlyPreferences() {

bool ExtensionPrefValueMap::DoesExtensionControlPref(

const std::string& extension_id,

const std::string& pref_key,

- bool incognito) const {

+ bool* from_incognito) const {

+ bool incognito = (from_incognito != NULL);

ExtensionEntryMap::const_iterator winner =

- GetEffectivePrefValueController(pref_key, incognito, NULL);

+ GetEffectivePrefValueController(pref_key, incognito, from_incognito);

if (winner == entries_.end())

return false;

return winner->first == extension_id;