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

Side by Side Diff: extensions/common/manifest_handlers/requirements_info.cc

Issue 1908953003: Convert //extensions/{common,shell} from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase? Created 4 years, 8 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/manifest_handlers/requirements_info.h" 5 #include "extensions/common/manifest_handlers/requirements_info.h"
6 6
7 #include <memory>
8
7 #include "base/lazy_instance.h" 9 #include "base/lazy_instance.h"
8 #include "base/memory/scoped_ptr.h"
9 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
10 #include "base/values.h" 11 #include "base/values.h"
11 #include "extensions/common/error_utils.h" 12 #include "extensions/common/error_utils.h"
12 #include "extensions/common/manifest_constants.h" 13 #include "extensions/common/manifest_constants.h"
13 14
14 namespace extensions { 15 namespace extensions {
15 16
16 namespace keys = manifest_keys; 17 namespace keys = manifest_keys;
17 namespace errors = manifest_errors; 18 namespace errors = manifest_errors;
18 19
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 55
55 const std::vector<std::string> RequirementsHandler::Keys() const { 56 const std::vector<std::string> RequirementsHandler::Keys() const {
56 return SingleKey(keys::kRequirements); 57 return SingleKey(keys::kRequirements);
57 } 58 }
58 59
59 bool RequirementsHandler::AlwaysParseForType(Manifest::Type type) const { 60 bool RequirementsHandler::AlwaysParseForType(Manifest::Type type) const {
60 return true; 61 return true;
61 } 62 }
62 63
63 bool RequirementsHandler::Parse(Extension* extension, base::string16* error) { 64 bool RequirementsHandler::Parse(Extension* extension, base::string16* error) {
64 scoped_ptr<RequirementsInfo> requirements( 65 std::unique_ptr<RequirementsInfo> requirements(
65 new RequirementsInfo(extension->manifest())); 66 new RequirementsInfo(extension->manifest()));
66 67
67 if (!extension->manifest()->HasKey(keys::kRequirements)) { 68 if (!extension->manifest()->HasKey(keys::kRequirements)) {
68 extension->SetManifestData(keys::kRequirements, requirements.release()); 69 extension->SetManifestData(keys::kRequirements, requirements.release());
69 return true; 70 return true;
70 } 71 }
71 72
72 const base::DictionaryValue* requirements_value = NULL; 73 const base::DictionaryValue* requirements_value = NULL;
73 if (!extension->manifest()->GetDictionary(keys::kRequirements, 74 if (!extension->manifest()->GetDictionary(keys::kRequirements,
74 &requirements_value)) { 75 &requirements_value)) {
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 *error = base::ASCIIToUTF16(errors::kInvalidRequirements); 151 *error = base::ASCIIToUTF16(errors::kInvalidRequirements);
151 return false; 152 return false;
152 } 153 }
153 } 154 }
154 155
155 extension->SetManifestData(keys::kRequirements, requirements.release()); 156 extension->SetManifestData(keys::kRequirements, requirements.release());
156 return true; 157 return true;
157 } 158 }
158 159
159 } // namespace extensions 160 } // namespace extensions
OLDNEW
« no previous file with comments | « extensions/common/manifest_handlers/requirements_info.h ('k') | extensions/common/manifest_handlers/sandboxed_page_info.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698