| OLD | NEW |
| 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 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 63 base::StringPiece ReadFromResource(int resource_id) { | 63 base::StringPiece ReadFromResource(int resource_id) { |
| 64 return ResourceBundle::GetSharedInstance().GetRawDataResource(resource_id); | 64 return ResourceBundle::GetSharedInstance().GetRawDataResource(resource_id); |
| 65 } | 65 } |
| 66 | 66 |
| 67 scoped_ptr<ListValue> LoadSchemaList(const std::string& name, | 67 scoped_ptr<ListValue> LoadSchemaList(const std::string& name, |
| 68 const base::StringPiece& schema) { | 68 const base::StringPiece& schema) { |
| 69 std::string error_message; | 69 std::string error_message; |
| 70 scoped_ptr<Value> result( | 70 scoped_ptr<Value> result( |
| 71 base::JSONReader::ReadAndReturnError( | 71 base::JSONReader::ReadAndReturnError( |
| 72 schema.as_string(), | 72 schema.as_string(), |
| 73 base::JSON_PARSE_RFC, // options | 73 base::JSON_PARSE_RFC | base::JSON_DETACHABLE_CHILDREN, // options |
| 74 NULL, // error code | 74 NULL, // error code |
| 75 &error_message)); | 75 &error_message)); |
| 76 | 76 |
| 77 // Tracking down http://crbug.com/121424 | 77 // Tracking down http://crbug.com/121424 |
| 78 char buf[128]; | 78 char buf[128]; |
| 79 base::snprintf(buf, arraysize(buf), "%s: (%d) '%s'", | 79 base::snprintf(buf, arraysize(buf), "%s: (%d) '%s'", |
| 80 name.c_str(), | 80 name.c_str(), |
| 81 result.get() ? result->GetType() : -1, | 81 result.get() ? result->GetType() : -1, |
| 82 error_message.c_str()); | 82 error_message.c_str()); |
| 83 | 83 |
| (...skipping 642 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 726 | 726 |
| 727 void ExtensionAPI::LoadAllSchemas() { | 727 void ExtensionAPI::LoadAllSchemas() { |
| 728 while (unloaded_schemas_.size()) { | 728 while (unloaded_schemas_.size()) { |
| 729 std::map<std::string, base::StringPiece>::iterator it = | 729 std::map<std::string, base::StringPiece>::iterator it = |
| 730 unloaded_schemas_.begin(); | 730 unloaded_schemas_.begin(); |
| 731 LoadSchema(it->first, it->second); | 731 LoadSchema(it->first, it->second); |
| 732 } | 732 } |
| 733 } | 733 } |
| 734 | 734 |
| 735 } // namespace extensions | 735 } // namespace extensions |
| OLD | NEW |