summaryrefslogtreecommitdiffstats
path: root/chrome/browser/sessions/restore_on_startup_policy_handler.cc
diff options
context:
space:
mode:
authorbrettw <brettw@chromium.org>2016-02-01 16:19:08 -0800
committerCommit bot <commit-bot@chromium.org>2016-02-02 00:20:47 +0000
commitb1fc1b83eb6eb10a7ebaff22c76082c3f0629f36 (patch)
treee60f5a4f77cbd196d75e1f03e5b7a8153941b4b6 /chrome/browser/sessions/restore_on_startup_policy_handler.cc
parent913701b1fa2ea8a63f095454d8147d1a3b8262af (diff)
downloadchromium_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/sessions/restore_on_startup_policy_handler.cc')
-rw-r--r--chrome/browser/sessions/restore_on_startup_policy_handler.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/sessions/restore_on_startup_policy_handler.cc b/chrome/browser/sessions/restore_on_startup_policy_handler.cc
index 57c435a..b460671 100644
--- a/chrome/browser/sessions/restore_on_startup_policy_handler.cc
+++ b/chrome/browser/sessions/restore_on_startup_policy_handler.cc
@@ -4,13 +4,13 @@
#include "chrome/browser/sessions/restore_on_startup_policy_handler.h"
-#include "base/prefs/pref_value_map.h"
#include "base/strings/string_number_conversions.h"
#include "base/values.h"
#include "chrome/browser/prefs/session_startup_pref.h"
#include "chrome/common/pref_names.h"
#include "components/policy/core/browser/policy_error_map.h"
#include "components/policy/core/common/policy_map.h"
+#include "components/prefs/pref_value_map.h"
#include "grit/components_strings.h"
#include "policy/policy_constants.h"