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

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

Issue 89243003: Move EmptyString, kWhitespace and the BOM to base. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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 | Annotate | Revision Log
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 "base/memory/scoped_ptr.h"
8 #include "base/strings/string_util.h" 8 #include "base/strings/string_util.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "base/values.h" 10 #include "base/values.h"
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 } 51 }
52 52
53 CSPInfo::~CSPInfo() { 53 CSPInfo::~CSPInfo() {
54 } 54 }
55 55
56 // static 56 // static
57 const std::string& CSPInfo::GetContentSecurityPolicy( 57 const std::string& CSPInfo::GetContentSecurityPolicy(
58 const Extension* extension) { 58 const Extension* extension) {
59 CSPInfo* csp_info = static_cast<CSPInfo*>( 59 CSPInfo* csp_info = static_cast<CSPInfo*>(
60 extension->GetManifestData(keys::kContentSecurityPolicy)); 60 extension->GetManifestData(keys::kContentSecurityPolicy));
61 return csp_info ? csp_info->content_security_policy : EmptyString(); 61 return csp_info ? csp_info->content_security_policy : base::EmptyString();
62 } 62 }
63 63
64 // static 64 // static
65 const std::string& CSPInfo::GetResourceContentSecurityPolicy( 65 const std::string& CSPInfo::GetResourceContentSecurityPolicy(
66 const Extension* extension, 66 const Extension* extension,
67 const std::string& relative_path) { 67 const std::string& relative_path) {
68 return SandboxedPageInfo::IsSandboxedPage(extension, relative_path) ? 68 return SandboxedPageInfo::IsSandboxedPage(extension, relative_path) ?
69 SandboxedPageInfo::GetContentSecurityPolicy(extension) : 69 SandboxedPageInfo::GetContentSecurityPolicy(extension) :
70 GetContentSecurityPolicy(extension); 70 GetContentSecurityPolicy(extension);
71 } 71 }
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 type == Manifest::TYPE_LEGACY_PACKAGED_APP; 124 type == Manifest::TYPE_LEGACY_PACKAGED_APP;
125 } 125 }
126 126
127 const std::vector<std::string> CSPHandler::Keys() const { 127 const std::vector<std::string> CSPHandler::Keys() const {
128 const std::string& key = is_platform_app_ ? 128 const std::string& key = is_platform_app_ ?
129 keys::kPlatformAppContentSecurityPolicy : keys::kContentSecurityPolicy; 129 keys::kPlatformAppContentSecurityPolicy : keys::kContentSecurityPolicy;
130 return SingleKey(key); 130 return SingleKey(key);
131 } 131 }
132 132
133 } // namespace extensions 133 } // namespace extensions
OLDNEW
« no previous file with comments | « extensions/browser/file_highlighter_unittest.cc ('k') | google_apis/gaia/google_service_auth_error.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698