diff options
| author | treib <treib@chromium.org> | 2016-03-08 08:30:13 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-08 16:31:16 +0000 |
| commit | 3e7756c7d39828136744fe7dffe1104eb5433843 (patch) | |
| tree | a985078e47760bba7899771a23dc5331774a8165 /extensions/common | |
| parent | c24416c14fe16743e6cc6edafc1a28e0a1d51473 (diff) | |
| download | chromium_src-3e7756c7d39828136744fe7dffe1104eb5433843.zip chromium_src-3e7756c7d39828136744fe7dffe1104eb5433843.tar.gz chromium_src-3e7756c7d39828136744fe7dffe1104eb5433843.tar.bz2 | |
Cleanup: remove evil hack to suppress permission warnings for searchProvider
BUG=533086
Review URL: https://codereview.chromium.org/1774103002
Cr-Commit-Position: refs/heads/master@{#379840}
Diffstat (limited to 'extensions/common')
| -rw-r--r-- | extensions/common/permissions/settings_override_permission.cc | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/extensions/common/permissions/settings_override_permission.cc b/extensions/common/permissions/settings_override_permission.cc index 43765d2..69318d829 100644 --- a/extensions/common/permissions/settings_override_permission.cc +++ b/extensions/common/permissions/settings_override_permission.cc @@ -48,14 +48,7 @@ bool SettingsOverrideAPIPermission::FromValue( const base::Value* value, std::string* /*error*/, std::vector<std::string>* unhandled_permissions) { - // Ugly hack: |value| being null should be an error. But before M46 beta, we - // didn't store the parameter for settings override permissions in prefs. - // See crbug.com/533086. - // TODO(treib,devlin): Remove this for M48, when hopefully all users will have - // updated prefs. - // This should read: - // return value && value->GetAsString(&setting_value_); - return !value || value->GetAsString(&setting_value_); + return value && value->GetAsString(&setting_value_); } scoped_ptr<base::Value> SettingsOverrideAPIPermission::ToValue() const { |