Index: apps/shell/common/shell_extensions_client.cc |
diff --git a/apps/shell/common/shell_extensions_client.cc b/apps/shell/common/shell_extensions_client.cc |
index bd1dc1ca061ac21f8a2d520de80f92f1ad6cc899..959464ca2994d4f5d9743df8345231c87860b288 100644 |
--- a/apps/shell/common/shell_extensions_client.cc |
+++ b/apps/shell/common/shell_extensions_client.cc |
@@ -4,6 +4,7 @@ |
#include "apps/shell/common/shell_extensions_client.h" |
+#include "apps/shell/common/api/generated_schemas.h" |
#include "apps/shell/common/shell_app_runtime.h" |
#include "base/logging.h" |
#include "chrome/common/extensions/api/generated_schemas.h" |
@@ -192,6 +193,7 @@ bool ShellExtensionsClient::IsAPISchemaGenerated( |
// have the Chrome app APIs available. |
return extensions::api::GeneratedSchemas::IsGenerated(name) || |
extensions::core_api::GeneratedSchemas::IsGenerated(name) || |
+ apps::shell_api::GeneratedSchemas::IsGenerated(name) || |
name == extensions::ShellAppRuntime::GetName(); |
} |
@@ -202,7 +204,12 @@ base::StringPiece ShellExtensionsClient::GetAPISchema( |
if (extensions::api::GeneratedSchemas::IsGenerated(name)) |
return extensions::api::GeneratedSchemas::Get(name); |
+ // Schema for chrome.shell APIs. |
+ if (apps::shell_api::GeneratedSchemas::IsGenerated(name)) |
+ return apps::shell_api::GeneratedSchemas::Get(name); |
+ |
// Special-case our simplified app.runtime implementation. |
+ // TODO(jamescook): Move this into a chrome.shell.onLaunched() event. |
if (name == extensions::ShellAppRuntime::GetName()) |
return extensions::ShellAppRuntime::GetSchema(); |