diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-15 17:37:26 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-15 17:37:26 +0000 |
| commit | f0c8c4993d1828df35581db849c2d4563fc12479 (patch) | |
| tree | c40d0e7358871a596f21c9f89c480ef0834ea5fd /apps/shell | |
| parent | e6fc1e2494a088bc9115104da81d9fbdbec2fc56 (diff) | |
| download | chromium_src-f0c8c4993d1828df35581db849c2d4563fc12479.zip chromium_src-f0c8c4993d1828df35581db849c2d4563fc12479.tar.gz chromium_src-f0c8c4993d1828df35581db849c2d4563fc12479.tar.bz2 | |
components: Extract pref_registry component out of user_prefs.
The reason for doing this is that user_prefs depends on content_browser,
which brings a lot of extra dependencies that takes a lot of time to build
(yeah, I'm looking at you Blink and V8) and bookmarks is one of the targets
that should not depend on content.
BUG=359565
TEST=green trybots
R=blundell@chromium.org, sky@chromium.org, yoz@chromium.org
Review URL: https://codereview.chromium.org/271793003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@270722 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'apps/shell')
| -rw-r--r-- | apps/shell/app_shell.gyp | 2 | ||||
| -rw-r--r-- | apps/shell/browser/DEPS | 1 | ||||
| -rw-r--r-- | apps/shell/browser/shell_extensions_browser_client.cc | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/apps/shell/app_shell.gyp b/apps/shell/app_shell.gyp index a0634f8..4e5e22f 100644 --- a/apps/shell/app_shell.gyp +++ b/apps/shell/app_shell.gyp @@ -71,6 +71,8 @@ '<(DEPTH)/apps/shell/common/api/api.gyp:shell_api', '<(DEPTH)/base/base.gyp:base', '<(DEPTH)/base/base.gyp:base_prefs_test_support', + '<(DEPTH)/components/components.gyp:pref_registry', + '<(DEPTH)/components/components.gyp:user_prefs', '<(DEPTH)/content/content.gyp:content', '<(DEPTH)/content/content.gyp:content_gpu', '<(DEPTH)/content/content.gyp:content_ppapi_plugin', diff --git a/apps/shell/browser/DEPS b/apps/shell/browser/DEPS index 9d8d30b..a803ec5 100644 --- a/apps/shell/browser/DEPS +++ b/apps/shell/browser/DEPS @@ -1,5 +1,6 @@ include_rules = [ "+chromeos", + "+components/pref_registry", "+components/user_prefs", "+third_party/cros_system_api", diff --git a/apps/shell/browser/shell_extensions_browser_client.cc b/apps/shell/browser/shell_extensions_browser_client.cc index 343f6b5..6e8f3ef 100644 --- a/apps/shell/browser/shell_extensions_browser_client.cc +++ b/apps/shell/browser/shell_extensions_browser_client.cc @@ -12,7 +12,7 @@ #include "base/prefs/pref_service.h" #include "base/prefs/pref_service_factory.h" #include "base/prefs/testing_pref_store.h" -#include "components/user_prefs/pref_registry_syncable.h" +#include "components/pref_registry/pref_registry_syncable.h" #include "components/user_prefs/user_prefs.h" #include "extensions/browser/api/extensions_api_client.h" #include "extensions/browser/app_sorting.h" |