| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "extensions/common/permissions/settings_override_permission.h" | 5 #include "extensions/common/permissions/settings_override_permission.h" |
| 6 | 6 |
| 7 #include <memory> |
| 8 |
| 9 #include "base/memory/ptr_util.h" |
| 7 #include "base/strings/utf_string_conversions.h" | 10 #include "base/strings/utf_string_conversions.h" |
| 8 #include "extensions/common/permissions/api_permission_set.h" | 11 #include "extensions/common/permissions/api_permission_set.h" |
| 9 #include "grit/extensions_strings.h" | 12 #include "grit/extensions_strings.h" |
| 10 #include "ui/base/l10n/l10n_util.h" | 13 #include "ui/base/l10n/l10n_util.h" |
| 11 | 14 |
| 12 namespace extensions { | 15 namespace extensions { |
| 13 | 16 |
| 14 SettingsOverrideAPIPermission::SettingsOverrideAPIPermission( | 17 SettingsOverrideAPIPermission::SettingsOverrideAPIPermission( |
| 15 const APIPermissionInfo* permission) | 18 const APIPermissionInfo* permission) |
| 16 : APIPermission(permission) {} | 19 : APIPermission(permission) {} |
| (...skipping 27 matching lines...) Expand all Loading... |
| 44 return true; | 47 return true; |
| 45 } | 48 } |
| 46 | 49 |
| 47 bool SettingsOverrideAPIPermission::FromValue( | 50 bool SettingsOverrideAPIPermission::FromValue( |
| 48 const base::Value* value, | 51 const base::Value* value, |
| 49 std::string* /*error*/, | 52 std::string* /*error*/, |
| 50 std::vector<std::string>* unhandled_permissions) { | 53 std::vector<std::string>* unhandled_permissions) { |
| 51 return value && value->GetAsString(&setting_value_); | 54 return value && value->GetAsString(&setting_value_); |
| 52 } | 55 } |
| 53 | 56 |
| 54 scoped_ptr<base::Value> SettingsOverrideAPIPermission::ToValue() const { | 57 std::unique_ptr<base::Value> SettingsOverrideAPIPermission::ToValue() const { |
| 55 return make_scoped_ptr(new base::StringValue(setting_value_)); | 58 return base::WrapUnique(new base::StringValue(setting_value_)); |
| 56 } | 59 } |
| 57 | 60 |
| 58 APIPermission* SettingsOverrideAPIPermission::Clone() const { | 61 APIPermission* SettingsOverrideAPIPermission::Clone() const { |
| 59 return new SettingsOverrideAPIPermission(info(), setting_value_); | 62 return new SettingsOverrideAPIPermission(info(), setting_value_); |
| 60 } | 63 } |
| 61 | 64 |
| 62 APIPermission* SettingsOverrideAPIPermission::Diff( | 65 APIPermission* SettingsOverrideAPIPermission::Diff( |
| 63 const APIPermission* rhs) const { | 66 const APIPermission* rhs) const { |
| 64 CHECK_EQ(info(), rhs->info()); | 67 CHECK_EQ(info(), rhs->info()); |
| 65 return NULL; | 68 return NULL; |
| (...skipping 16 matching lines...) Expand all Loading... |
| 82 bool SettingsOverrideAPIPermission::Read(const base::Pickle* m, | 85 bool SettingsOverrideAPIPermission::Read(const base::Pickle* m, |
| 83 base::PickleIterator* iter) { | 86 base::PickleIterator* iter) { |
| 84 return true; | 87 return true; |
| 85 } | 88 } |
| 86 | 89 |
| 87 void SettingsOverrideAPIPermission::Log(std::string* log) const { | 90 void SettingsOverrideAPIPermission::Log(std::string* log) const { |
| 88 *log = setting_value_; | 91 *log = setting_value_; |
| 89 } | 92 } |
| 90 | 93 |
| 91 } // namespace extensions | 94 } // namespace extensions |
| OLD | NEW |