From b1fc1b83eb6eb10a7ebaff22c76082c3f0629f36 Mon Sep 17 00:00:00 2001 From: brettw Date: Mon, 1 Feb 2016 16:19:08 -0800 Subject: 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} --- chrome/browser/ui/webui/help/help_handler.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'chrome/browser/ui/webui/help/help_handler.cc') diff --git a/chrome/browser/ui/webui/help/help_handler.cc b/chrome/browser/ui/webui/help/help_handler.cc index a449b65..0db8cc3 100644 --- a/chrome/browser/ui/webui/help/help_handler.cc +++ b/chrome/browser/ui/webui/help/help_handler.cc @@ -51,7 +51,6 @@ #if defined(OS_CHROMEOS) #include "base/files/file_util_proxy.h" #include "base/i18n/time_formatting.h" -#include "base/prefs/pref_service.h" #include "base/sys_info.h" #include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h" #include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos_factory.h" @@ -66,6 +65,7 @@ #include "chromeos/dbus/dbus_thread_manager.h" #include "chromeos/dbus/power_manager_client.h" #include "chromeos/system/statistics_provider.h" +#include "components/prefs/pref_service.h" #include "components/user_manager/user_manager.h" #endif -- cgit v1.1