| Index: extensions/browser/extension_pref_value_map.cc
|
| diff --git a/extensions/browser/extension_pref_value_map.cc b/extensions/browser/extension_pref_value_map.cc
|
| index 0797b2416e3c03e7eaf55985e88a0fae77f2bbc3..63e601d62602ac60ab29615ca0d982c834d12d2b 100644
|
| --- a/extensions/browser/extension_pref_value_map.cc
|
| +++ b/extensions/browser/extension_pref_value_map.cc
|
| @@ -80,7 +80,7 @@ bool ExtensionPrefValueMap::CanExtensionControlPref(
|
| return false;
|
|
|
| ExtensionEntryMap::const_iterator winner =
|
| - GetEffectivePrefValueController(pref_key, incognito, NULL);
|
| + GetEffectivePrefValueController(pref_key, incognito, nullptr);
|
| if (winner == entries_.end())
|
| return true;
|
|
|
| @@ -110,7 +110,7 @@ bool ExtensionPrefValueMap::DoesExtensionControlPref(
|
| const std::string& extension_id,
|
| const std::string& pref_key,
|
| bool* from_incognito) const {
|
| - bool incognito = (from_incognito != NULL);
|
| + bool incognito = (from_incognito != nullptr);
|
| ExtensionEntryMap::const_iterator winner =
|
| GetEffectivePrefValueController(pref_key, incognito, from_incognito);
|
| if (winner == entries_.end())
|
| @@ -193,7 +193,7 @@ PrefValueMap* ExtensionPrefValueMap::GetExtensionPrefValueMap(
|
| return &(i->second->incognito_profile_preferences_session_only);
|
| }
|
| NOTREACHED();
|
| - return NULL;
|
| + return nullptr;
|
| }
|
|
|
| const PrefValueMap* ExtensionPrefValueMap::GetExtensionPrefValueMap(
|
| @@ -212,7 +212,7 @@ const PrefValueMap* ExtensionPrefValueMap::GetExtensionPrefValueMap(
|
| return &(i->second->incognito_profile_preferences_session_only);
|
| }
|
| NOTREACHED();
|
| - return NULL;
|
| + return nullptr;
|
| }
|
|
|
| void ExtensionPrefValueMap::GetExtensionControlledKeys(
|
| @@ -247,9 +247,9 @@ const base::Value* ExtensionPrefValueMap::GetEffectivePrefValue(
|
| ExtensionEntryMap::const_iterator winner =
|
| GetEffectivePrefValueController(key, incognito, from_incognito);
|
| if (winner == entries_.end())
|
| - return NULL;
|
| + return nullptr;
|
|
|
| - const base::Value* value = NULL;
|
| + const base::Value* value = nullptr;
|
| const std::string& ext_id = winner->first;
|
|
|
| // First search for incognito session only preferences.
|
| @@ -307,7 +307,7 @@ ExtensionPrefValueMap::GetEffectivePrefValueController(
|
| if (incognito && !incognito_enabled)
|
| continue;
|
|
|
| - const base::Value* value = NULL;
|
| + const base::Value* value = nullptr;
|
| const PrefValueMap* prefs = GetExtensionPrefValueMap(
|
| ext_id, extensions::kExtensionPrefsScopeRegular);
|
| if (prefs->GetValue(key, &value)) {
|
| @@ -374,7 +374,7 @@ void ExtensionPrefValueMap::RemoveObserver(
|
| std::string ExtensionPrefValueMap::GetExtensionControllingPref(
|
| const std::string& pref_key) const {
|
| ExtensionEntryMap::const_iterator winner =
|
| - GetEffectivePrefValueController(pref_key, false, NULL);
|
| + GetEffectivePrefValueController(pref_key, false, nullptr);
|
| if (winner == entries_.end())
|
| return std::string();
|
| return winner->first;
|
|
|