Index: chrome/renderer/extensions/api_definitions_natives.cc |
diff --git a/chrome/renderer/extensions/api_definitions_natives.cc b/chrome/renderer/extensions/api_definitions_natives.cc |
index 6004c7ae0c0de8c698454c75325f38170d5c2c15..e0845315fd7ab1c11dd6b3084aec42b2e7f9f2cb 100644 |
--- a/chrome/renderer/extensions/api_definitions_natives.cc |
+++ b/chrome/renderer/extensions/api_definitions_natives.cc |
@@ -6,7 +6,7 @@ |
#include <algorithm> |
-#include "chrome/common/extensions/api/extension_api.h" |
+#include "chrome/common/extensions/features/base_feature_provider.h" |
namespace { |
const char kInvalidExtensionNamespace[] = "Invalid extension namespace"; |
@@ -25,8 +25,15 @@ ApiDefinitionsNatives::ApiDefinitionsNatives(Dispatcher* dispatcher, |
v8::Handle<v8::Value> ApiDefinitionsNatives::GetExtensionAPIDefinitions( |
const v8::Arguments& args) { |
- return dispatcher()->v8_schema_registry()->GetSchemas( |
- ExtensionAPI::GetSharedInstance()->GetAllAPINames()); |
+ std::vector<std::string> apis; |
+ const std::vector<std::string>& feature_names = |
not at google - send to devlin
2013/05/30 16:38:52
bleh. this function is going to get messy - and I
cduvall
2013/06/12 01:22:19
I renamed to GetExtensionAPIDefinitionsForTest. I
not at google - send to devlin
2013/06/12 22:34:18
Thanks. Yeah I got the webview people to fix that
|
+ BaseFeatureProvider::GetByName("api")->GetAllFeatureNames(); |
+ for (std::vector<std::string>::const_iterator i = feature_names.begin(); |
+ i != feature_names.end(); ++i) { |
+ if (!BaseFeatureProvider::GetByName("api")->GetFeature(*i)->HasParent()) |
+ apis.push_back(*i); |
+ } |
+ return dispatcher()->v8_schema_registry()->GetSchemas(apis); |
} |
} // namespace extensions |