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

Side by Side Diff: extensions/common/manifest_handlers/csp_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/csp_info.h" 5 #include "extensions/common/manifest_handlers/csp_info.h"
6 6
7 #include "base/memory/scoped_ptr.h" 7 #include <memory>
8
8 #include "base/strings/string_util.h" 9 #include "base/strings/string_util.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/csp_validator.h" 12 #include "extensions/common/csp_validator.h"
12 #include "extensions/common/install_warning.h" 13 #include "extensions/common/install_warning.h"
13 #include "extensions/common/manifest_constants.h" 14 #include "extensions/common/manifest_constants.h"
14 #include "extensions/common/manifest_handlers/sandboxed_page_info.h" 15 #include "extensions/common/manifest_handlers/sandboxed_page_info.h"
15 16
16 namespace extensions { 17 namespace extensions {
17 18
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 type == Manifest::TYPE_LEGACY_PACKAGED_APP; 154 type == Manifest::TYPE_LEGACY_PACKAGED_APP;
154 } 155 }
155 156
156 const std::vector<std::string> CSPHandler::Keys() const { 157 const std::vector<std::string> CSPHandler::Keys() const {
157 const std::string& key = is_platform_app_ ? 158 const std::string& key = is_platform_app_ ?
158 keys::kPlatformAppContentSecurityPolicy : keys::kContentSecurityPolicy; 159 keys::kPlatformAppContentSecurityPolicy : keys::kContentSecurityPolicy;
159 return SingleKey(key); 160 return SingleKey(key);
160 } 161 }
161 162
162 } // namespace extensions 163 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698