diff options
| author | hashimoto@chromium.org <hashimoto@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-04 05:00:12 +0000 |
|---|---|---|
| committer | hashimoto@chromium.org <hashimoto@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-04 05:00:12 +0000 |
| commit | eaee4dfa5afc6a1699befb07bf945dd7599c7889 (patch) | |
| tree | c34517f3c1a95c1bd71d1b0454b061ccd8eb5a03 /chrome/browser/android/logo_service.cc | |
| parent | 916fbf7cb8bbdb397e324e8649c61e95dc20f72a (diff) | |
| download | chromium_src-eaee4dfa5afc6a1699befb07bf945dd7599c7889.zip chromium_src-eaee4dfa5afc6a1699befb07bf945dd7599c7889.tar.gz chromium_src-eaee4dfa5afc6a1699befb07bf945dd7599c7889.tar.bz2 | |
Revert of Componentize TemplateURLService (https://codereview.chromium.org/367023002/)
Reason for revert:
Failed on android_aosp:
http://build.chromium.org/p/chromium.linux/builders/Android%20Webview%20AOSP%20Builder/builds/12338
Original issue's description:
> Componentize TemplateURLService
>
> Move TemplateURLService, SearchHostToURLsMap, util.cc from chrome/browser/search_engines to components/search_engines
> Move KeywordTable and KeywordWeDataService from chrome/browser/webdata to components/search_engines
> Fix DEPS, OWNERS and gyp.
> Replace HistoryDatabase in keyword_table.cc with URLDatabase.
>
> BUG=386367
> TEST=build and checkdeps
> R=blundell@chromium.org, jochen@chromium.org, pkasting@chromium.org
> TBR=jochen@chromium.org for include fix, erikwright@chromium.org as an owner of sql, atwilson@chromium.org as an owner of sync
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=281350
TBR=pkasting@chromium.org,blundell@chromium.org,jochen@chromium.org,erikwright@chromium.org,atwilson@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=386367
Review URL: https://codereview.chromium.org/363323007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@281362 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/android/logo_service.cc')
| -rw-r--r-- | chrome/browser/android/logo_service.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/android/logo_service.cc b/chrome/browser/android/logo_service.cc index fec67fd..681fbde 100644 --- a/chrome/browser/android/logo_service.cc +++ b/chrome/browser/android/logo_service.cc @@ -8,11 +8,11 @@ #include "chrome/browser/google/google_profile_helper.h" #include "chrome/browser/image_decoder.h" #include "chrome/browser/profiles/profile.h" +#include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "components/google/core/browser/google_url_tracker.h" #include "components/google/core/browser/google_util.h" #include "components/keyed_service/content/browser_context_dependency_manager.h" -#include "components/search_engines/template_url_service.h" #include "components/search_provider_logos/google_logo_api.h" #include "content/public/browser/browser_thread.h" #include "net/url_request/url_request_context_getter.h" |