summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/views/download
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/ui/views/download
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/ui/views/download')
-rw-r--r--chrome/browser/ui/views/download/download_feedback_dialog_view.cc2
-rw-r--r--chrome/browser/ui/views/download/download_item_view.cc2
-rw-r--r--chrome/browser/ui/views/download/download_item_view_md.cc2
3 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/ui/views/download/download_feedback_dialog_view.cc b/chrome/browser/ui/views/download/download_feedback_dialog_view.cc
index 1d2f0b32..76cef77 100644
--- a/chrome/browser/ui/views/download/download_feedback_dialog_view.cc
+++ b/chrome/browser/ui/views/download/download_feedback_dialog_view.cc
@@ -5,7 +5,6 @@
#include "chrome/browser/ui/views/download/download_feedback_dialog_view.h"
#include "base/metrics/histogram.h"
-#include "base/prefs/pref_service.h"
#include "base/supports_user_data.h"
#include "chrome/browser/platform_util.h"
#include "chrome/browser/profiles/profile.h"
@@ -13,6 +12,7 @@
#include "chrome/grit/chromium_strings.h"
#include "chrome/grit/generated_resources.h"
#include "components/constrained_window/constrained_window_views.h"
+#include "components/prefs/pref_service.h"
#include "content/public/browser/page_navigator.h"
#include "grit/components_strings.h"
#include "ui/base/l10n/l10n_util.h"
diff --git a/chrome/browser/ui/views/download/download_item_view.cc b/chrome/browser/ui/views/download/download_item_view.cc
index 74edc47..9c9ce22 100644
--- a/chrome/browser/ui/views/download/download_item_view.cc
+++ b/chrome/browser/ui/views/download/download_item_view.cc
@@ -16,7 +16,6 @@
#include "base/i18n/rtl.h"
#include "base/location.h"
#include "base/metrics/histogram.h"
-#include "base/prefs/pref_service.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
#include "base/strings/sys_string_conversions.h"
@@ -38,6 +37,7 @@
#include "chrome/browser/ui/views/frame/browser_view.h"
#include "chrome/common/pref_names.h"
#include "chrome/grit/generated_resources.h"
+#include "components/prefs/pref_service.h"
#include "content/public/browser/download_danger_type.h"
#include "grit/theme_resources.h"
#include "third_party/icu/source/common/unicode/uchar.h"
diff --git a/chrome/browser/ui/views/download/download_item_view_md.cc b/chrome/browser/ui/views/download/download_item_view_md.cc
index 987192c..0cb0b6d 100644
--- a/chrome/browser/ui/views/download/download_item_view_md.cc
+++ b/chrome/browser/ui/views/download/download_item_view_md.cc
@@ -17,7 +17,6 @@
#include "base/location.h"
#include "base/macros.h"
#include "base/metrics/histogram.h"
-#include "base/prefs/pref_service.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
#include "base/strings/sys_string_conversions.h"
@@ -40,6 +39,7 @@
#include "chrome/browser/ui/views/frame/browser_view.h"
#include "chrome/common/pref_names.h"
#include "chrome/grit/generated_resources.h"
+#include "components/prefs/pref_service.h"
#include "content/public/browser/download_danger_type.h"
#include "third_party/icu/source/common/unicode/uchar.h"
#include "ui/accessibility/ax_view_state.h"