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

Side by Side Diff: chrome/common/extensions/api/extension_api.cc

Issue 9960077: Modify the base::JSONReader interface to take a set of options rather than a boolean flag. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address comments Created 8 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/api/extension_api.h" 5 #include "chrome/common/extensions/api/extension_api.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 61
62 base::StringPiece ReadFromResource(int resource_id) { 62 base::StringPiece ReadFromResource(int resource_id) {
63 return ResourceBundle::GetSharedInstance().GetRawDataResource(resource_id); 63 return ResourceBundle::GetSharedInstance().GetRawDataResource(resource_id);
64 } 64 }
65 65
66 scoped_ptr<ListValue> LoadSchemaList(const base::StringPiece& schema) { 66 scoped_ptr<ListValue> LoadSchemaList(const base::StringPiece& schema) {
67 std::string error_message; 67 std::string error_message;
68 scoped_ptr<Value> result( 68 scoped_ptr<Value> result(
69 base::JSONReader::ReadAndReturnError( 69 base::JSONReader::ReadAndReturnError(
70 schema.as_string(), 70 schema.as_string(),
71 false, // allow trailing commas 71 base::JSON_PARSE_RFC, // options
72 NULL, // error code 72 NULL, // error code
73 &error_message)); 73 &error_message));
74 CHECK(result.get()) << error_message; 74 CHECK(result.get()) << error_message;
75 CHECK(result->IsType(Value::TYPE_LIST)); 75 CHECK(result->IsType(Value::TYPE_LIST));
76 return scoped_ptr<ListValue>(static_cast<ListValue*>(result.release())); 76 return scoped_ptr<ListValue>(static_cast<ListValue*>(result.release()));
77 } 77 }
78 78
79 DictionaryValue* FindListItem(const ListValue* list, 79 DictionaryValue* FindListItem(const ListValue* list,
80 const std::string& property_name, 80 const std::string& property_name,
81 const std::string& property_value) { 81 const std::string& property_value) {
(...skipping 633 matching lines...) Expand 10 before | Expand all | Expand 10 after
715 } 715 }
716 } 716 }
717 717
718 void ExtensionAPI::LoadAllSchemas() { 718 void ExtensionAPI::LoadAllSchemas() {
719 while (unloaded_schemas_.size()) { 719 while (unloaded_schemas_.size()) {
720 LoadSchema(unloaded_schemas_.begin()->second); 720 LoadSchema(unloaded_schemas_.begin()->second);
721 } 721 }
722 } 722 }
723 723
724 } // namespace extensions 724 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698