Moved ExtensionPrefs and related into extensions namespace
Moved ExtensionPrefs, ExtensionPrefsScope, and TestExtensionPrefs into
extensions namespace.
BUG=135024, 117261
Review URL: https://chromiumcodereview.appspot.com/10704023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@145898 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/extensions/extension_pref_value_map.cc b/chrome/browser/extensions/extension_pref_value_map.cc
index 18586e06..8e750b9 100644
--- a/chrome/browser/extensions/extension_pref_value_map.cc
+++ b/chrome/browser/extensions/extension_pref_value_map.cc
@@ -8,6 +8,8 @@
#include "base/values.h"
#include "chrome/browser/prefs/pref_value_map.h"
+using extensions::ExtensionPrefsScope;
+
struct ExtensionPrefValueMap::ExtensionEntry {
// Installation time of the extension.
base::Time install_time;
@@ -155,13 +157,13 @@
ExtensionEntryMap::const_iterator i = entries_.find(ext_id);
CHECK(i != entries_.end());
switch (scope) {
- case kExtensionPrefsScopeRegular:
+ case extensions::kExtensionPrefsScopeRegular:
return &(i->second->regular_profile_preferences);
- case kExtensionPrefsScopeRegularOnly:
+ case extensions::kExtensionPrefsScopeRegularOnly:
return &(i->second->regular_only_profile_preferences);
- case kExtensionPrefsScopeIncognitoPersistent:
+ case extensions::kExtensionPrefsScopeIncognitoPersistent:
return &(i->second->incognito_profile_preferences_persistent);
- case kExtensionPrefsScopeIncognitoSessionOnly:
+ case extensions::kExtensionPrefsScopeIncognitoSessionOnly:
return &(i->second->incognito_profile_preferences_session_only);
}
NOTREACHED();
@@ -174,13 +176,13 @@
ExtensionEntryMap::const_iterator i = entries_.find(ext_id);
CHECK(i != entries_.end());
switch (scope) {
- case kExtensionPrefsScopeRegular:
+ case extensions::kExtensionPrefsScopeRegular:
return &(i->second->regular_profile_preferences);
- case kExtensionPrefsScopeRegularOnly:
+ case extensions::kExtensionPrefsScopeRegularOnly:
return &(i->second->regular_only_profile_preferences);
- case kExtensionPrefsScopeIncognitoPersistent:
+ case extensions::kExtensionPrefsScopeIncognitoPersistent:
return &(i->second->incognito_profile_preferences_persistent);
- case kExtensionPrefsScopeIncognitoSessionOnly:
+ case extensions::kExtensionPrefsScopeIncognitoSessionOnly:
return &(i->second->incognito_profile_preferences_session_only);
}
NOTREACHED();
@@ -227,22 +229,23 @@
// First search for incognito session only preferences.
if (incognito) {
const PrefValueMap* prefs = GetExtensionPrefValueMap(
- ext_id, kExtensionPrefsScopeIncognitoSessionOnly);
+ ext_id, extensions::kExtensionPrefsScopeIncognitoSessionOnly);
prefs->GetValue(key, &value);
if (value)
return value;
// If no incognito session only preference exists, fall back to persistent
// incognito preference.
- prefs = GetExtensionPrefValueMap(ext_id,
- kExtensionPrefsScopeIncognitoPersistent);
+ prefs = GetExtensionPrefValueMap(
+ ext_id,
+ extensions::kExtensionPrefsScopeIncognitoPersistent);
prefs->GetValue(key, &value);
if (value)
return value;
} else {
// Regular-only preference.
const PrefValueMap* prefs = GetExtensionPrefValueMap(
- ext_id, kExtensionPrefsScopeRegularOnly);
+ ext_id, extensions::kExtensionPrefsScopeRegularOnly);
prefs->GetValue(key, &value);
if (value)
return value;
@@ -250,7 +253,7 @@
// Regular preference.
const PrefValueMap* prefs = GetExtensionPrefValueMap(
- ext_id, kExtensionPrefsScopeRegular);
+ ext_id, extensions::kExtensionPrefsScopeRegular);
prefs->GetValue(key, &value);
return value;
}
@@ -276,7 +279,7 @@
const Value* value = NULL;
const PrefValueMap* prefs = GetExtensionPrefValueMap(
- ext_id, kExtensionPrefsScopeRegular);
+ ext_id, extensions::kExtensionPrefsScopeRegular);
if (prefs->GetValue(key, &value)) {
winner = i;
winners_install_time = install_time;
@@ -286,7 +289,7 @@
if (!incognito) {
const PrefValueMap* prefs = GetExtensionPrefValueMap(
- ext_id, kExtensionPrefsScopeRegularOnly);
+ ext_id, extensions::kExtensionPrefsScopeRegularOnly);
if (prefs->GetValue(key, &value)) {
winner = i;
winners_install_time = install_time;
@@ -298,7 +301,7 @@
}
prefs = GetExtensionPrefValueMap(
- ext_id, kExtensionPrefsScopeIncognitoPersistent);
+ ext_id, extensions::kExtensionPrefsScopeIncognitoPersistent);
if (prefs->GetValue(key, &value)) {
winner = i;
winners_install_time = install_time;
@@ -307,7 +310,7 @@
}
prefs = GetExtensionPrefValueMap(
- ext_id, kExtensionPrefsScopeIncognitoSessionOnly);
+ ext_id, extensions::kExtensionPrefsScopeIncognitoSessionOnly);
if (prefs->GetValue(key, &value)) {
winner = i;
winners_install_time = install_time;
