| 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 2bcbc28a6bb9c5d592161b04cb6e0e27025e6ffc..1bdd767f3e3ed8ca86969d99cda7f4cbbe0c955f 100644
|
| --- a/chrome/renderer/extensions/api_definitions_natives.cc
|
| +++ b/chrome/renderer/extensions/api_definitions_natives.cc
|
| @@ -12,9 +12,8 @@ const char kInvalidExtensionNamespace[] = "Invalid extension namespace";
|
|
|
| namespace extensions {
|
|
|
| -ApiDefinitionsNatives::ApiDefinitionsNatives(
|
| - ExtensionDispatcher* extension_dispatcher)
|
| - : ChromeV8Extension(extension_dispatcher) {
|
| +ApiDefinitionsNatives::ApiDefinitionsNatives(Dispatcher* dispatcher)
|
| + : ChromeV8Extension(dispatcher) {
|
| RouteFunction("GetExtensionAPIDefinition",
|
| base::Bind(&ApiDefinitionsNatives::GetExtensionAPIDefinition,
|
| base::Unretained(this)));
|
| @@ -22,15 +21,13 @@ ApiDefinitionsNatives::ApiDefinitionsNatives(
|
|
|
| v8::Handle<v8::Value> ApiDefinitionsNatives::GetExtensionAPIDefinition(
|
| const v8::Arguments& args) {
|
| - ChromeV8Context* v8_context =
|
| - extension_dispatcher()->v8_context_set().GetCurrent();
|
| + ChromeV8Context* v8_context = dispatcher()->v8_context_set().GetCurrent();
|
| CHECK(v8_context);
|
|
|
| std::set<std::string> available_apis(v8_context->GetAvailableExtensionAPIs());
|
| - if (args.Length() == 0) {
|
| - return extension_dispatcher()->v8_schema_registry()->GetSchemas(
|
| - available_apis);
|
| - }
|
| + if (args.Length() == 0)
|
| + return dispatcher()->v8_schema_registry()->GetSchemas(available_apis);
|
| +
|
| // Build set of APIs requested by the user.
|
| std::set<std::string> requested_apis;
|
| for (int i = 0; i < args.Length(); ++i) {
|
| @@ -46,8 +43,7 @@ v8::Handle<v8::Value> ApiDefinitionsNatives::GetExtensionAPIDefinition(
|
| std::set_intersection(requested_apis.begin(), requested_apis.end(),
|
| available_apis.begin(), available_apis.end(),
|
| std::inserter(apis_to_check, apis_to_check.begin()));
|
| - return extension_dispatcher()->v8_schema_registry()->GetSchemas(
|
| - apis_to_check);
|
| + return dispatcher()->v8_schema_registry()->GetSchemas(apis_to_check);
|
| }
|
|
|
| } // namespace extensions
|
|
|