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

Unified Diff: apps/shell/browser/shell_extensions_browser_client.cc

Issue 217533006: Introduce apps API target in //apps and move app.runtime API into it (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix dependencies (app-runtime-move) Created 6 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « apps/shell/browser/shell_extension_system.cc ('k') | apps/shell/common/shell_extensions_client.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: apps/shell/browser/shell_extensions_browser_client.cc
diff --git a/apps/shell/browser/shell_extensions_browser_client.cc b/apps/shell/browser/shell_extensions_browser_client.cc
index 13321ec4dbe981232612843960c4fec80f0e3976..76d966712d43bbac7f26aeb1376f72f0ff611a0d 100644
--- a/apps/shell/browser/shell_extensions_browser_client.cc
+++ b/apps/shell/browser/shell_extensions_browser_client.cc
@@ -4,6 +4,7 @@
#include "apps/shell/browser/shell_extensions_browser_client.h"
+#include "apps/common/api/generated_api.h"
#include "apps/shell/browser/shell_app_sorting.h"
#include "apps/shell/browser/shell_extension_system_factory.h"
#include "apps/shell/browser/shell_extension_web_contents_observer.h"
@@ -197,7 +198,10 @@ ShellExtensionsBrowserClient::GetExtensionSystemFactory() {
void ShellExtensionsBrowserClient::RegisterExtensionFunctions(
ExtensionFunctionRegistry* registry) const {
+ // Generated APIs from lower-level modules.
extensions::core_api::GeneratedFunctionRegistry::RegisterAll(registry);
+ apps::api::GeneratedFunctionRegistry::RegisterAll(registry);
+
// TODO(rockot): Remove dependency on src/chrome once we have some core APIs
// moved out. See http://crbug.com/349042.
extensions::api::GeneratedFunctionRegistry::RegisterAll(registry);
« no previous file with comments | « apps/shell/browser/shell_extension_system.cc ('k') | apps/shell/common/shell_extensions_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698