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/views/create_application_shortcut_view.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'chrome/browser/ui/views/create_application_shortcut_view.cc') diff --git a/chrome/browser/ui/views/create_application_shortcut_view.cc b/chrome/browser/ui/views/create_application_shortcut_view.cc index 4f64137..ea708e3 100644 --- a/chrome/browser/ui/views/create_application_shortcut_view.cc +++ b/chrome/browser/ui/views/create_application_shortcut_view.cc @@ -11,7 +11,6 @@ #include "base/bind.h" #include "base/bind_helpers.h" -#include "base/prefs/pref_service.h" #include "base/strings/utf_string_conversions.h" #include "base/win/windows_version.h" #include "build/build_config.h" @@ -28,6 +27,7 @@ #include "chrome/grit/locale_settings.h" #include "components/constrained_window/constrained_window_views.h" #include "components/favicon_base/select_favicon_frames.h" +#include "components/prefs/pref_service.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/render_widget_host_view.h" #include "content/public/browser/web_contents.h" -- cgit v1.1