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

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

Issue 93793010: Update uses of UTF conversions in chrome/common to use the base:: namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 12 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 | Annotate | Revision Log
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"
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
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(manifest_errors::kInvalidIsolation); 62 *error = base::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 manifest_errors::kInvalidIsolationValue, 71 manifest_errors::kInvalidIsolationValue,
72 base::UintToString(i)); 72 base::UintToString(i));
(...skipping 16 matching lines...) Expand all
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

Powered by Google App Engine
This is Rietveld 408576698