diff options
| author | msramek <msramek@chromium.org> | 2015-05-29 10:34:59 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-05-29 17:35:28 +0000 |
| commit | 25e27589e68568be1e61a215862054ad40e0e95e (patch) | |
| tree | 4e766e5802b37cfb837c86ed285ce1f7658ab639 /components/content_settings | |
| parent | 35411be880615e548ac2df01befc462aa8ae4821 (diff) | |
| download | chromium_src-25e27589e68568be1e61a215862054ad40e0e95e.zip chromium_src-25e27589e68568be1e61a215862054ad40e0e95e.tar.gz chromium_src-25e27589e68568be1e61a215862054ad40e0e95e.tar.bz2 | |
Fix shadowing variables in ContentSettingsPrefProvider.
BUG=427616
Review URL: https://codereview.chromium.org/1101713004
Cr-Commit-Position: refs/heads/master@{#332002}
Diffstat (limited to 'components/content_settings')
| -rw-r--r-- | components/content_settings/core/browser/content_settings_pref_provider.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/components/content_settings/core/browser/content_settings_pref_provider.cc b/components/content_settings/core/browser/content_settings_pref_provider.cc index 2319578..938eaa1 100644 --- a/components/content_settings/core/browser/content_settings_pref_provider.cc +++ b/components/content_settings/core/browser/content_settings_pref_provider.cc @@ -404,8 +404,8 @@ void PrefProvider::ReadContentSettingsFromOldPref() { bool is_dictionary = i.value().GetAsDictionary(&settings_dictionary); DCHECK(is_dictionary); - for (size_t i = 0; i < CONTENT_SETTINGS_NUM_TYPES; ++i) { - ContentSettingsType content_type = static_cast<ContentSettingsType>(i); + for (size_t k = 0; k < CONTENT_SETTINGS_NUM_TYPES; ++k) { + ContentSettingsType content_type = static_cast<ContentSettingsType>(k); std::string res_dictionary_path; if (GetResourceTypeName(content_type, &res_dictionary_path)) { @@ -435,14 +435,14 @@ void PrefProvider::ReadContentSettingsFromOldPref() { const base::DictionaryValue* setting = NULL; // TODO(xians): Handle the non-dictionary types. if (settings_dictionary->GetDictionaryWithoutPathExpansion( - GetTypeName(ContentSettingsType(i)), &setting)) { + GetTypeName(content_type), &setting)) { DCHECK(!setting->empty()); value = setting->DeepCopy(); } } else { int setting = CONTENT_SETTING_DEFAULT; if (settings_dictionary->GetIntegerWithoutPathExpansion( - GetTypeName(ContentSettingsType(i)), &setting)) { + GetTypeName(content_type), &setting)) { DCHECK_NE(CONTENT_SETTING_DEFAULT, setting); setting = FixObsoleteCookiePromptMode(content_type, ContentSetting(setting)); |