diff options
| author | blundell@chromium.org <blundell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-08 11:47:58 +0000 |
|---|---|---|
| committer | blundell@chromium.org <blundell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-08 11:47:58 +0000 |
| commit | a1fcc1d501e1e8e85d97795c1c450f5325a82614 (patch) | |
| tree | bd2dac696cfe6a2368bd7ae9f1871f3535b2ad18 /chrome/browser/android | |
| parent | 9d51882d2222c2bf221d3ba4449be7916ebf39fc (diff) | |
| download | chromium_src-a1fcc1d501e1e8e85d97795c1c450f5325a82614.zip chromium_src-a1fcc1d501e1e8e85d97795c1c450f5325a82614.tar.gz chromium_src-a1fcc1d501e1e8e85d97795c1c450f5325a82614.tar.bz2 | |
Componentize GoogleURLTracker(InfoBarDelegate,MapEntry,NavHelper)
This CL moves GoogleURLTracker and associated friends to the Google component.
It additionally moves strings that GoogleURLTrackerInfoBarDelegate into
components_strings.grd (via google_strings.grdp).
Dependencies of this code on google_util are temporarily punched through the
embedder, as google_util will require more time to componentize. Once
google_util is componentized, the indirection through the embedder will be
removed.
BUG=373209,373222
TBR=thakis, cbentzel
Review URL: https://codereview.chromium.org/316203003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@275743 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/android')
| -rw-r--r-- | chrome/browser/android/logo_service.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/android/tab_android.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/android/logo_service.cc b/chrome/browser/android/logo_service.cc index ed44ac1..c3ef401 100644 --- a/chrome/browser/android/logo_service.cc +++ b/chrome/browser/android/logo_service.cc @@ -6,12 +6,12 @@ #include "base/memory/weak_ptr.h" #include "chrome/browser/google/google_profile_helper.h" -#include "chrome/browser/google/google_url_tracker.h" #include "chrome/browser/google/google_util.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/keyed_service/content/browser_context_dependency_manager.h" #include "components/search_provider_logos/google_logo_api.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/android/tab_android.cc b/chrome/browser/android/tab_android.cc index 932fdb8..bb80a5c 100644 --- a/chrome/browser/android/tab_android.cc +++ b/chrome/browser/android/tab_android.cc @@ -12,7 +12,6 @@ #include "chrome/browser/browser_about_handler.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/content_settings/tab_specific_content_settings.h" -#include "chrome/browser/google/google_url_tracker.h" #include "chrome/browser/google/google_url_tracker_factory.h" #include "chrome/browser/google/google_util.h" #include "chrome/browser/infobars/infobar_service.h" @@ -38,6 +37,7 @@ #include "chrome/browser/ui/toolbar/toolbar_model_impl.h" #include "chrome/common/net/url_fixer_upper.h" #include "chrome/common/url_constants.h" +#include "components/google/core/browser/google_url_tracker.h" #include "components/infobars/core/infobar_container.h" #include "content/public/browser/android/content_view_core.h" #include "content/public/browser/navigation_entry.h" |