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

Side by Side Diff: chrome/common/extensions/manifest_handlers/app_isolation_info.cc

Issue 23744004: Move the rest of extension_manifest_constants to top-level extensions/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Latest master Created 7 years, 3 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 (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 "chrome/common/extensions/manifest_handlers/app_isolation_info.h" 5 #include "chrome/common/extensions/manifest_handlers/app_isolation_info.h"
6 6
7 #include "base/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "base/strings/string16.h" 8 #include "base/strings/string16.h"
9 #include "base/strings/string_number_conversions.h" 9 #include "base/strings/string_number_conversions.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
11 #include "base/values.h" 11 #include "base/values.h"
12 #include "chrome/common/extensions/extension_manifest_constants.h"
13 #include "chrome/common/extensions/permissions/api_permission_set.h" 12 #include "chrome/common/extensions/permissions/api_permission_set.h"
14 #include "chrome/common/extensions/permissions/permissions_data.h" 13 #include "chrome/common/extensions/permissions/permissions_data.h"
15 #include "extensions/common/error_utils.h" 14 #include "extensions/common/error_utils.h"
15 #include "extensions/common/manifest_constants.h"
16 16
17 namespace extensions { 17 namespace extensions {
18 18
19 namespace keys = manifest_keys; 19 namespace keys = manifest_keys;
20 20
21 AppIsolationInfo::AppIsolationInfo(bool isolated_storage) 21 AppIsolationInfo::AppIsolationInfo(bool isolated_storage)
22 : has_isolated_storage(isolated_storage) { 22 : has_isolated_storage(isolated_storage) {
23 } 23 }
24 24
25 AppIsolationInfo::~AppIsolationInfo() { 25 AppIsolationInfo::~AppIsolationInfo() {
(...skipping 26 matching lines...) Expand all
52 APIPermission::kExperimental)) { 52 APIPermission::kExperimental)) {
53 return true; 53 return true;
54 } 54 }
55 55
56 // We should only be parsing if the extension has the key in the manifest, 56 // We should only be parsing if the extension has the key in the manifest,
57 // or is a platform app (which we already handled). 57 // or is a platform app (which we already handled).
58 DCHECK(extension->manifest()->HasPath(keys::kIsolation)); 58 DCHECK(extension->manifest()->HasPath(keys::kIsolation));
59 59
60 const base::ListValue* isolation_list = NULL; 60 const base::ListValue* isolation_list = NULL;
61 if (!extension->manifest()->GetList(keys::kIsolation, &isolation_list)) { 61 if (!extension->manifest()->GetList(keys::kIsolation, &isolation_list)) {
62 *error = ASCIIToUTF16(extension_manifest_errors::kInvalidIsolation); 62 *error = ASCIIToUTF16(manifest_errors::kInvalidIsolation);
63 return false; 63 return false;
64 } 64 }
65 65
66 bool has_isolated_storage = false; 66 bool has_isolated_storage = false;
67 for (size_t i = 0; i < isolation_list->GetSize(); ++i) { 67 for (size_t i = 0; i < isolation_list->GetSize(); ++i) {
68 std::string isolation_string; 68 std::string isolation_string;
69 if (!isolation_list->GetString(i, &isolation_string)) { 69 if (!isolation_list->GetString(i, &isolation_string)) {
70 *error = ErrorUtils::FormatErrorMessageUTF16( 70 *error = ErrorUtils::FormatErrorMessageUTF16(
71 extension_manifest_errors::kInvalidIsolationValue, 71 manifest_errors::kInvalidIsolationValue,
72 base::UintToString(i)); 72 base::UintToString(i));
73 return false; 73 return false;
74 } 74 }
75 75
76 // Check for isolated storage. 76 // Check for isolated storage.
77 if (isolation_string == extension_manifest_values::kIsolatedStorage) { 77 if (isolation_string == manifest_values::kIsolatedStorage) {
78 has_isolated_storage = true; 78 has_isolated_storage = true;
79 } else { 79 } else {
80 DLOG(WARNING) << "Did not recognize isolation type: " << isolation_string; 80 DLOG(WARNING) << "Did not recognize isolation type: " << isolation_string;
81 } 81 }
82 } 82 }
83 83
84 if (has_isolated_storage) 84 if (has_isolated_storage)
85 extension->SetManifestData(keys::kIsolation, new AppIsolationInfo(true)); 85 extension->SetManifestData(keys::kIsolation, new AppIsolationInfo(true));
86 86
87 return true; 87 return true;
88 } 88 }
89 89
90 bool AppIsolationHandler::AlwaysParseForType(Manifest::Type type) const { 90 bool AppIsolationHandler::AlwaysParseForType(Manifest::Type type) const {
91 return type == Manifest::TYPE_PLATFORM_APP; 91 return type == Manifest::TYPE_PLATFORM_APP;
92 } 92 }
93 93
94 const std::vector<std::string> AppIsolationHandler::Keys() const { 94 const std::vector<std::string> AppIsolationHandler::Keys() const {
95 return SingleKey(keys::kIsolation); 95 return SingleKey(keys::kIsolation);
96 } 96 }
97 97
98 } // namespace extensions 98 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/common/extensions/manifest_handler_helpers.cc ('k') | chrome/common/extensions/manifest_handlers/app_launch_info.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698