Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1133)

Unified Diff: chrome/browser/extensions/extension_prefs.h

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
Index: chrome/browser/extensions/extension_prefs.h
diff --git a/chrome/browser/extensions/extension_prefs.h b/chrome/browser/extensions/extension_prefs.h
index ae7f6264a28175c3689168aeb4b020c3b4ce059c..429131a911aaf2cc19e02ac763cb4a9325172002 100644
--- a/chrome/browser/extensions/extension_prefs.h
+++ b/chrome/browser/extensions/extension_prefs.h
@@ -382,10 +382,13 @@ class ExtensionPrefs : public extensions::ContentSettingsStore::Observer,
bool incognito);
// Returns true if extension |extension_id| currently controls the
- // preference.
+ // preference. If |from_incognito| is not NULL, looks at incognito preferences
+ // first, and |from_incognito| is set to true if the effective pref value is
+ // coming from the incognito preferences, false if it is coming from the
+ // normal ones.
bool DoesExtensionControlPref(const std::string& extension_id,
const std::string& pref_key,
- bool incognito);
+ bool* from_incognito);
// Returns true if there is an extension which controls the preference value
// for |pref_key| *and* it is specific to incognito mode.
« no previous file with comments | « chrome/browser/extensions/extension_preference_helpers.cc ('k') | chrome/browser/extensions/extension_prefs.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698