diff options
| author | brettw <brettw@chromium.org> | 2016-02-01 16:19:08 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-02-02 00:20:47 +0000 |
| commit | b1fc1b83eb6eb10a7ebaff22c76082c3f0629f36 (patch) | |
| tree | e60f5a4f77cbd196d75e1f03e5b7a8153941b4b6 /chrome/browser/ui/ash/launcher | |
| parent | 913701b1fa2ea8a63f095454d8147d1a3b8262af (diff) | |
| download | chromium_src-b1fc1b83eb6eb10a7ebaff22c76082c3f0629f36.zip chromium_src-b1fc1b83eb6eb10a7ebaff22c76082c3f0629f36.tar.gz chromium_src-b1fc1b83eb6eb10a7ebaff22c76082c3f0629f36.tar.bz2 | |
Update chrome for new prefs location.
This is a search-and-replace update for includes with "base/prefs" ->
"components/prefs" and the headers re-sorted in the chrome directory.
DEPS files were updated to allow the components in question to depend on
components/prefs. chrome/DEPS was updated to whitelist all components rather
than listing all the ones it uses out individually. Checkdeps is a tool to
enforce layering, and Chrome is allowed to depend on any component, so listing
each one it uses doesn't help anything.
This should be a no-op from a build perspective.
BUG=583034
TBR=jam@chromium.org
Review URL: https://codereview.chromium.org/1658793002
Cr-Commit-Position: refs/heads/master@{#372827}
Diffstat (limited to 'chrome/browser/ui/ash/launcher')
4 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc index 3a756d2..ce82d55 100644 --- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc +++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc @@ -22,7 +22,6 @@ #include "ash/wm/window_util.h" #include "base/command_line.h" #include "base/macros.h" -#include "base/prefs/scoped_user_pref_update.h" #include "base/strings/pattern.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" @@ -72,6 +71,7 @@ #include "chrome/common/url_constants.h" #include "chrome/grit/generated_resources.h" #include "components/favicon/content/content_favicon_driver.h" +#include "components/prefs/scoped_user_pref_update.h" #include "components/signin/core/account_id/account_id.h" #include "components/syncable_prefs/pref_service_syncable.h" #include "content/public/browser/navigation_entry.h" diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h index e63fa2f..29dab76 100644 --- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h +++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h @@ -24,13 +24,13 @@ #include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" -#include "base/prefs/pref_change_registrar.h" #include "build/build_config.h" #include "chrome/browser/extensions/app_icon_loader.h" #include "chrome/browser/ui/ash/app_sync_ui_state_observer.h" #include "chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item.h" #include "chrome/browser/ui/ash/launcher/chrome_launcher_types.h" #include "chrome/browser/ui/extensions/extension_enable_flow_delegate.h" +#include "components/prefs/pref_change_registrar.h" #include "components/syncable_prefs/pref_service_syncable_observer.h" #include "extensions/browser/extension_registry_observer.h" #include "extensions/common/constants.h" diff --git a/chrome/browser/ui/ash/launcher/launcher_context_menu.cc b/chrome/browser/ui/ash/launcher/launcher_context_menu.cc index b72aab1..b87d419 100644 --- a/chrome/browser/ui/ash/launcher/launcher_context_menu.cc +++ b/chrome/browser/ui/ash/launcher/launcher_context_menu.cc @@ -14,7 +14,6 @@ #include "ash/shelf/shelf_widget.h" #include "ash/shell.h" #include "base/bind.h" -#include "base/prefs/pref_service.h" #include "build/build_config.h" #include "chrome/browser/extensions/context_menu_matcher.h" #include "chrome/browser/extensions/extension_util.h" @@ -25,6 +24,7 @@ #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/grit/generated_resources.h" +#include "components/prefs/pref_service.h" #include "content/public/common/context_menu_params.h" #include "grit/ash_strings.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc b/chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc index 3d730a8..87e1dc1 100644 --- a/chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc +++ b/chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc @@ -10,12 +10,12 @@ #include "ash/shell.h" #include "ash/test/ash_test_base.h" #include "base/macros.h" -#include "base/prefs/pref_service.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/prefs/incognito_mode_prefs.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h" #include "chrome/test/base/testing_profile.h" +#include "components/prefs/pref_service.h" #include "ui/aura/window_event_dispatcher.h" class TestChromeLauncherController : public ChromeLauncherController { |