Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(188)

Side by Side Diff: extensions/common/permissions/settings_override_permission.cc

Issue 598173003: Run clang-modernize -use-nullptr over src/extensions/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "grit/extensions_strings.h" 8 #include "grit/extensions_strings.h"
9 #include "ui/base/l10n/l10n_util.h" 9 #include "ui/base/l10n/l10n_util.h"
10 10
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 PermissionMessages result; 43 PermissionMessages result;
44 result.push_back( 44 result.push_back(
45 PermissionMessage(info()->message_id(), 45 PermissionMessage(info()->message_id(),
46 l10n_util::GetStringFUTF16( 46 l10n_util::GetStringFUTF16(
47 string_id, base::UTF8ToUTF16(setting_value_)))); 47 string_id, base::UTF8ToUTF16(setting_value_))));
48 return result; 48 return result;
49 } 49 }
50 50
51 bool SettingsOverrideAPIPermission::Check( 51 bool SettingsOverrideAPIPermission::Check(
52 const APIPermission::CheckParam* param) const { 52 const APIPermission::CheckParam* param) const {
53 return (param == NULL); 53 return (param == nullptr);
54 } 54 }
55 55
56 bool SettingsOverrideAPIPermission::Contains(const APIPermission* rhs) const { 56 bool SettingsOverrideAPIPermission::Contains(const APIPermission* rhs) const {
57 CHECK_EQ(info(), rhs->info()); 57 CHECK_EQ(info(), rhs->info());
58 return true; 58 return true;
59 } 59 }
60 60
61 bool SettingsOverrideAPIPermission::Equal(const APIPermission* rhs) const { 61 bool SettingsOverrideAPIPermission::Equal(const APIPermission* rhs) const {
62 if (this != rhs) 62 if (this != rhs)
63 CHECK_EQ(info(), rhs->info()); 63 CHECK_EQ(info(), rhs->info());
64 return true; 64 return true;
65 } 65 }
66 66
67 bool SettingsOverrideAPIPermission::FromValue( 67 bool SettingsOverrideAPIPermission::FromValue(
68 const base::Value* value, 68 const base::Value* value,
69 std::string* /*error*/, 69 std::string* /*error*/,
70 std::vector<std::string>* unhandled_permissions) { 70 std::vector<std::string>* unhandled_permissions) {
71 return (value == NULL); 71 return (value == nullptr);
72 } 72 }
73 73
74 scoped_ptr<base::Value> SettingsOverrideAPIPermission::ToValue() const { 74 scoped_ptr<base::Value> SettingsOverrideAPIPermission::ToValue() const {
75 return scoped_ptr<base::Value>(); 75 return scoped_ptr<base::Value>();
76 } 76 }
77 77
78 APIPermission* SettingsOverrideAPIPermission::Clone() const { 78 APIPermission* SettingsOverrideAPIPermission::Clone() const {
79 return new SettingsOverrideAPIPermission(info(), setting_value_); 79 return new SettingsOverrideAPIPermission(info(), setting_value_);
80 } 80 }
81 81
82 APIPermission* SettingsOverrideAPIPermission::Diff( 82 APIPermission* SettingsOverrideAPIPermission::Diff(
83 const APIPermission* rhs) const { 83 const APIPermission* rhs) const {
84 CHECK_EQ(info(), rhs->info()); 84 CHECK_EQ(info(), rhs->info());
85 return NULL; 85 return nullptr;
86 } 86 }
87 87
88 APIPermission* SettingsOverrideAPIPermission::Union( 88 APIPermission* SettingsOverrideAPIPermission::Union(
89 const APIPermission* rhs) const { 89 const APIPermission* rhs) const {
90 CHECK_EQ(info(), rhs->info()); 90 CHECK_EQ(info(), rhs->info());
91 return new SettingsOverrideAPIPermission(info(), setting_value_); 91 return new SettingsOverrideAPIPermission(info(), setting_value_);
92 } 92 }
93 93
94 APIPermission* SettingsOverrideAPIPermission::Intersect( 94 APIPermission* SettingsOverrideAPIPermission::Intersect(
95 const APIPermission* rhs) const { 95 const APIPermission* rhs) const {
96 CHECK_EQ(info(), rhs->info()); 96 CHECK_EQ(info(), rhs->info());
97 return new SettingsOverrideAPIPermission(info(), setting_value_); 97 return new SettingsOverrideAPIPermission(info(), setting_value_);
98 } 98 }
99 99
100 void SettingsOverrideAPIPermission::Write(IPC::Message* m) const {} 100 void SettingsOverrideAPIPermission::Write(IPC::Message* m) const {}
101 101
102 bool SettingsOverrideAPIPermission::Read(const IPC::Message* m, 102 bool SettingsOverrideAPIPermission::Read(const IPC::Message* m,
103 PickleIterator* iter) { 103 PickleIterator* iter) {
104 return true; 104 return true;
105 } 105 }
106 106
107 void SettingsOverrideAPIPermission::Log(std::string* log) const {} 107 void SettingsOverrideAPIPermission::Log(std::string* log) const {}
108 108
109 } // namespace extensions 109 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698