summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui
diff options
context:
space:
mode:
authorsdefresne <sdefresne@chromium.org>2014-12-30 11:23:49 -0800
committerCommit bot <commit-bot@chromium.org>2014-12-30 19:25:07 +0000
commiteb278881097c0365c0e265392ff50f03c6292862 (patch)
tree80af2b03f42385a846fbe92787461b2c94b4d8c3 /chrome/browser/ui
parentd8de1100ecce0dbf8e0e52a7bf72f0e5517b5ff8 (diff)
downloadchromium_src-eb278881097c0365c0e265392ff50f03c6292862.zip
chromium_src-eb278881097c0365c0e265392ff50f03c6292862.tar.gz
chromium_src-eb278881097c0365c0e265392ff50f03c6292862.tar.bz2
Partial componentization of //chrome/browser/history
Move thumbnail_database.{cc,h} to //components/history/core/browser as they don't have dependency on //chrome or //content and add a new depenency on //third_party/sqlite from the history component. Move url_utils.{cc,h}, visit_filter.{cc,h}, visit_tracker.{cc,h}, visitsegment_database.{cc,h}, in_memory_url_index_types.{cc,h} and top_sites_cache.{cc,h} to //components/history/core/browser as they are leaf files that don't have dependency on //chrome or //content. Move visit_database.{cc,h} to //components/history/core/browser after fixing the #include to use "url/url_constants.h" to get the constants defined in the url namespace. Move in_memory_url_index_cache.proto since it has no dependencies and add the gyp target history_core_browser_proto and gn target //components/history/core/browser:proto. All files were moved using tools/git/move_source_files.py and then the build system files (gyp and gn) were manually editted. Remove obsolete #includes and fix missing #includes. BUG=390953, 370850 TBR=sky@chromium.org Review URL: https://codereview.chromium.org/831643003 Cr-Commit-Position: refs/heads/master@{#309765}
Diffstat (limited to 'chrome/browser/ui')
-rw-r--r--chrome/browser/ui/BUILD.gn2
-rw-r--r--chrome/browser/ui/webui/ntp/suggestions_source_top_sites.cc3
-rw-r--r--chrome/browser/ui/webui/ntp/suggestions_source_top_sites.h2
3 files changed, 4 insertions, 3 deletions
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
index 41e2328..6ca4613 100644
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -41,7 +41,6 @@ static_library("ui") {
"//chrome:strings",
"//chrome/app/resources:platform_locale_settings",
"//chrome/app/theme:theme_resources",
- "//chrome/browser/history:in_memory_url_index_cache_proto",
"//chrome/browser/net:cert_logger_proto",
"//chrome/common",
"//chrome/common/net",
@@ -49,6 +48,7 @@ static_library("ui") {
"//components/auto_login_parser",
"//components/dom_distiller/webui",
"//components/feedback/proto",
+ "//components/history/core/browser:proto",
"//components/invalidation",
"//components/omaha_client",
"//components/onc",
diff --git a/chrome/browser/ui/webui/ntp/suggestions_source_top_sites.cc b/chrome/browser/ui/webui/ntp/suggestions_source_top_sites.cc
index 93b5204..49fb628 100644
--- a/chrome/browser/ui/webui/ntp/suggestions_source_top_sites.cc
+++ b/chrome/browser/ui/webui/ntp/suggestions_source_top_sites.cc
@@ -10,13 +10,14 @@
#include "base/stl_util.h"
#include "base/strings/string_number_conversions.h"
#include "base/values.h"
+#include "chrome/browser/history/history_service.h"
#include "chrome/browser/history/history_service_factory.h"
#include "chrome/browser/history/top_sites.h"
-#include "chrome/browser/history/visit_filter.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/webui/ntp/new_tab_ui.h"
#include "chrome/browser/ui/webui/ntp/suggestions_combiner.h"
#include "chrome/common/chrome_switches.h"
+#include "components/history/core/browser/visit_filter.h"
namespace {
diff --git a/chrome/browser/ui/webui/ntp/suggestions_source_top_sites.h b/chrome/browser/ui/webui/ntp/suggestions_source_top_sites.h
index 818397c..3d22043 100644
--- a/chrome/browser/ui/webui/ntp/suggestions_source_top_sites.h
+++ b/chrome/browser/ui/webui/ntp/suggestions_source_top_sites.h
@@ -9,9 +9,9 @@
#include "base/basictypes.h"
#include "base/task/cancelable_task_tracker.h"
-#include "chrome/browser/history/visit_filter.h"
#include "chrome/browser/ui/webui/ntp/suggestions_source.h"
#include "components/history/core/browser/history_types.h"
+#include "components/history/core/browser/visit_filter.h"
class SuggestionsCombiner;
class Profile;