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

Unified Diff: apps/shell/common/shell_extensions_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_extensions_browser_client.cc ('k') | chrome/browser/apps/app_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 4172816acd4c7d7e61b6d38614cd881572eb680b..61d39333cfde45ee977770093020ee97a6f1bba2 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/common/api/generated_schemas.h"
#include "base/logging.h"
#include "chrome/common/extensions/api/generated_schemas.h"
#include "chrome/common/extensions/features/base_feature_provider.h"
@@ -155,7 +156,8 @@ bool ShellExtensionsClient::IsAPISchemaGenerated(
// TODO(rockot): Remove dependency on src/chrome once we have some core APIs
// moved out. See http://crbug.com/349042.
return extensions::api::GeneratedSchemas::IsGenerated(name) ||
- extensions::core_api::GeneratedSchemas::IsGenerated(name);
+ extensions::core_api::GeneratedSchemas::IsGenerated(name) ||
+ apps::api::GeneratedSchemas::IsGenerated(name);
}
base::StringPiece ShellExtensionsClient::GetAPISchema(
@@ -164,7 +166,11 @@ base::StringPiece ShellExtensionsClient::GetAPISchema(
// moved out. See http://crbug.com/349042.
if (extensions::api::GeneratedSchemas::IsGenerated(name))
return extensions::api::GeneratedSchemas::Get(name);
- return extensions::core_api::GeneratedSchemas::Get(name);
+
+ if (extensions::core_api::GeneratedSchemas::IsGenerated(name))
+ return extensions::core_api::GeneratedSchemas::Get(name);
+
+ return apps::api::GeneratedSchemas::Get(name);
}
} // namespace apps
« no previous file with comments | « apps/shell/browser/shell_extensions_browser_client.cc ('k') | chrome/browser/apps/app_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698