diff options
author | rockot@chromium.org <rockot@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-08 02:34:05 +0000 |
---|---|---|
committer | rockot@chromium.org <rockot@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-08 02:34:05 +0000 |
commit | c1ecf0154fb19226fff518c542045fed9b7fe240 (patch) | |
tree | f5908703e879fac8dc1a2d026ac24d8dd7cd9aa1 /apps | |
parent | 0f46033279358343969874e8d706bc8ac8ad640f (diff) | |
download | chromium_src-c1ecf0154fb19226fff518c542045fed9b7fe240.zip chromium_src-c1ecf0154fb19226fff518c542045fed9b7fe240.tar.gz chromium_src-c1ecf0154fb19226fff518c542045fed9b7fe240.tar.bz2 |
Remove chrome dependencies from the app_shell target.
This severs all remaining link-time dependencies on source
modules in //chrome, with the exception of some generated
resources.
BUG=349042,359656
Review URL: https://codereview.chromium.org/268363007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@269017 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'apps')
-rw-r--r-- | apps/shell/DEPS | 9 | ||||
-rw-r--r-- | apps/shell/app_shell.gyp | 12 | ||||
-rw-r--r-- | apps/shell/browser/shell_extensions_browser_client.cc | 5 | ||||
-rw-r--r-- | apps/shell/common/shell_extensions_client.cc | 15 | ||||
-rw-r--r-- | apps/shell/common/shell_extensions_client.h | 3 |
5 files changed, 3 insertions, 41 deletions
diff --git a/apps/shell/DEPS b/apps/shell/DEPS index 8a9dc71..d1b37cd 100644 --- a/apps/shell/DEPS +++ b/apps/shell/DEPS @@ -16,17 +16,8 @@ include_rules = [ "+grit/app_shell_resources.h", "+grit/extensions_resources.h", - # TODO(yoz): Do not depend on Chrome resources. - "!grit/common_resources.h", - # Real DEPS go in subdirectories, for example apps/shell/browser/DEPS. # Temporary exceptions for app_shell bring-up go here. # TODO(jamescook): Remove these. http://crbug.com/305404 "!chrome/browser/chrome_notification_types.h", - "!chrome/common/extensions/api/generated_api.h", - "!chrome/common/extensions/api/generated_schemas.h", - "!chrome/common/extensions/permissions/chrome_api_permissions.h", - "!chrome/renderer/extensions/dispatcher.h", - "!chrome/renderer/extensions/extension_helper.h", - "!chrome/renderer/resource_bundle_source_map.h", ] diff --git a/apps/shell/app_shell.gyp b/apps/shell/app_shell.gyp index 6da130d..3fc8152 100644 --- a/apps/shell/app_shell.gyp +++ b/apps/shell/app_shell.gyp @@ -67,17 +67,6 @@ 'type': 'static_library', 'defines!': ['CONTENT_IMPLEMENTATION'], 'dependencies': [ - '<(DEPTH)/chrome/chrome.gyp:browser', - '<(DEPTH)/chrome/chrome.gyp:browser_extensions', - '<(DEPTH)/chrome/chrome.gyp:debugger', - '<(DEPTH)/chrome/chrome.gyp:plugin', - '<(DEPTH)/chrome/chrome.gyp:renderer', - '<(DEPTH)/chrome/chrome.gyp:utility', - '<(DEPTH)/chrome/chrome_resources.gyp:chrome_resources', - '<(DEPTH)/chrome/common/extensions/api/api.gyp:chrome_api', - '<(DEPTH)/third_party/WebKit/public/blink_devtools.gyp:blink_devtools_frontend_resources', - # TODO(rockot): Dependencies above this line are temporary. - # See http://crbug.com/359656. 'app_shell_pak', '<(DEPTH)/apps/shell/common/api/api.gyp:shell_api', '<(DEPTH)/base/base.gyp:base', @@ -153,6 +142,7 @@ 'dependencies': [ '<(DEPTH)/chromeos/chromeos.gyp:chromeos', '<(DEPTH)/ui/chromeos/ui_chromeos.gyp:ui_chromeos', + '<(DEPTH)/ui/display/display.gyp:display', ], }], ], diff --git a/apps/shell/browser/shell_extensions_browser_client.cc b/apps/shell/browser/shell_extensions_browser_client.cc index 054a717..343f6b5 100644 --- a/apps/shell/browser/shell_extensions_browser_client.cc +++ b/apps/shell/browser/shell_extensions_browser_client.cc @@ -12,7 +12,6 @@ #include "base/prefs/pref_service.h" #include "base/prefs/pref_service_factory.h" #include "base/prefs/testing_pref_store.h" -#include "chrome/common/extensions/api/generated_api.h" #include "components/user_prefs/pref_registry_syncable.h" #include "components/user_prefs/user_prefs.h" #include "extensions/browser/api/extensions_api_client.h" @@ -228,10 +227,6 @@ void ShellExtensionsBrowserClient::RegisterExtensionFunctions( // Register core extension-system APIs. extensions::core_api::GeneratedFunctionRegistry::RegisterAll(registry); - // TODO(rockot): Remove dependency on src/chrome once we have some core APIs - // moved out. Also clean up the comment below. See http://crbug.com/349042. - extensions::api::GeneratedFunctionRegistry::RegisterAll(registry); - // Register chrome.shell APIs. apps::shell_api::GeneratedFunctionRegistry::RegisterAll(registry); } diff --git a/apps/shell/common/shell_extensions_client.cc b/apps/shell/common/shell_extensions_client.cc index 5c142d4..fe01ea3 100644 --- a/apps/shell/common/shell_extensions_client.cc +++ b/apps/shell/common/shell_extensions_client.cc @@ -7,8 +7,6 @@ #include "apps/shell/common/api/generated_schemas.h" #include "base/lazy_instance.h" #include "base/logging.h" -#include "chrome/common/extensions/api/generated_schemas.h" -#include "chrome/common/extensions/permissions/chrome_api_permissions.h" #include "extensions/common/api/generated_schemas.h" #include "extensions/common/api/sockets/sockets_manifest_handler.h" #include "extensions/common/common_manifest_handlers.h" @@ -92,8 +90,7 @@ base::LazyInstance<ShellPermissionMessageProvider> } // namespace ShellExtensionsClient::ShellExtensionsClient() - : chrome_api_permissions_(extensions::ChromeAPIPermissions()), - extensions_api_permissions_(extensions::ExtensionsAPIPermissions()) { + : extensions_api_permissions_(extensions::ExtensionsAPIPermissions()) { } ShellExtensionsClient::~ShellExtensionsClient() { @@ -111,8 +108,6 @@ void ShellExtensionsClient::Initialize() { // TODO(jamescook): Do we need to whitelist any extensions? extensions::PermissionsInfo::GetInstance()->AddProvider( - chrome_api_permissions_); - extensions::PermissionsInfo::GetInstance()->AddProvider( extensions_api_permissions_); } @@ -181,18 +176,12 @@ bool ShellExtensionsClient::IsAPISchemaGenerated( // moved out. See http://crbug.com/349042. // Special-case our simplified app.runtime implementation because we don't // have the Chrome app APIs available. - return extensions::api::GeneratedSchemas::IsGenerated(name) || - extensions::core_api::GeneratedSchemas::IsGenerated(name) || + return extensions::core_api::GeneratedSchemas::IsGenerated(name) || apps::shell_api::GeneratedSchemas::IsGenerated(name); } base::StringPiece ShellExtensionsClient::GetAPISchema( const std::string& name) const { - // TODO(rockot): Remove dependency on src/chrome once we have some core APIs - // moved out. See http://crbug.com/349042. - 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); diff --git a/apps/shell/common/shell_extensions_client.h b/apps/shell/common/shell_extensions_client.h index 875ce57..847b4a0 100644 --- a/apps/shell/common/shell_extensions_client.h +++ b/apps/shell/common/shell_extensions_client.h @@ -7,7 +7,6 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "chrome/common/extensions/permissions/chrome_api_permissions.h" #include "extensions/common/extensions_client.h" #include "extensions/common/permissions/extensions_api_permissions.h" @@ -43,8 +42,6 @@ class ShellExtensionsClient : public extensions::ExtensionsClient { virtual bool ShouldSuppressFatalErrors() const OVERRIDE; private: - // TODO(yoz): Don't include Chrome permissions. - const extensions::ChromeAPIPermissions chrome_api_permissions_; const extensions::ExtensionsAPIPermissions extensions_api_permissions_; ScriptingWhitelist scripting_whitelist_; |