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

Side by Side Diff: extensions/common/manifest_handlers/shared_module_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/shared_module_info.h" 5 #include "extensions/common/manifest_handlers/shared_module_info.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <memory>
10
9 #include "base/lazy_instance.h" 11 #include "base/lazy_instance.h"
10 #include "base/macros.h" 12 #include "base/macros.h"
11 #include "base/memory/scoped_ptr.h"
12 #include "base/strings/string_number_conversions.h" 13 #include "base/strings/string_number_conversions.h"
13 #include "base/strings/string_split.h" 14 #include "base/strings/string_split.h"
14 #include "base/strings/string_util.h" 15 #include "base/strings/string_util.h"
15 #include "base/strings/utf_string_conversions.h" 16 #include "base/strings/utf_string_conversions.h"
16 #include "base/version.h" 17 #include "base/version.h"
17 #include "components/crx_file/id_util.h" 18 #include "components/crx_file/id_util.h"
18 #include "extensions/common/constants.h" 19 #include "extensions/common/constants.h"
19 #include "extensions/common/error_utils.h" 20 #include "extensions/common/error_utils.h"
20 #include "extensions/common/manifest_constants.h" 21 #include "extensions/common/manifest_constants.h"
21 #include "extensions/common/permissions/permission_set.h" 22 #include "extensions/common/permissions/permission_set.h"
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
199 } 200 }
200 201
201 202
202 SharedModuleHandler::SharedModuleHandler() { 203 SharedModuleHandler::SharedModuleHandler() {
203 } 204 }
204 205
205 SharedModuleHandler::~SharedModuleHandler() { 206 SharedModuleHandler::~SharedModuleHandler() {
206 } 207 }
207 208
208 bool SharedModuleHandler::Parse(Extension* extension, base::string16* error) { 209 bool SharedModuleHandler::Parse(Extension* extension, base::string16* error) {
209 scoped_ptr<SharedModuleInfo> info(new SharedModuleInfo); 210 std::unique_ptr<SharedModuleInfo> info(new SharedModuleInfo);
210 if (!info->Parse(extension, error)) 211 if (!info->Parse(extension, error))
211 return false; 212 return false;
212 extension->SetManifestData(kSharedModule, info.release()); 213 extension->SetManifestData(kSharedModule, info.release());
213 return true; 214 return true;
214 } 215 }
215 216
216 bool SharedModuleHandler::Validate( 217 bool SharedModuleHandler::Validate(
217 const Extension* extension, 218 const Extension* extension,
218 std::string* error, 219 std::string* error,
219 std::vector<InstallWarning>* warnings) const { 220 std::vector<InstallWarning>* warnings) const {
(...skipping 10 matching lines...) Expand all
230 231
231 const std::vector<std::string> SharedModuleHandler::Keys() const { 232 const std::vector<std::string> SharedModuleHandler::Keys() const {
232 static const char* keys[] = { 233 static const char* keys[] = {
233 keys::kExport, 234 keys::kExport,
234 keys::kImport 235 keys::kImport
235 }; 236 };
236 return std::vector<std::string>(keys, keys + arraysize(keys)); 237 return std::vector<std::string>(keys, keys + arraysize(keys));
237 } 238 }
238 239
239 } // namespace extensions 240 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698