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/google/chrome_google_url_tracker_client.cc | |
| 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/google/chrome_google_url_tracker_client.cc')
| -rw-r--r-- | chrome/browser/google/chrome_google_url_tracker_client.cc | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/chrome/browser/google/chrome_google_url_tracker_client.cc b/chrome/browser/google/chrome_google_url_tracker_client.cc index 85278ab..5f48e00 100644 --- a/chrome/browser/google/chrome_google_url_tracker_client.cc +++ b/chrome/browser/google/chrome_google_url_tracker_client.cc @@ -6,11 +6,12 @@ #include "base/command_line.h" #include "chrome/browser/chrome_notification_types.h" -#include "chrome/browser/google/google_url_tracker.h" #include "chrome/browser/google/google_url_tracker_navigation_helper_impl.h" +#include "chrome/browser/google/google_util.h" #include "chrome/browser/infobars/infobar_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_switches.h" +#include "components/google/core/browser/google_url_tracker.h" #include "content/public/browser/navigation_controller.h" #include "content/public/browser/navigation_entry.h" #include "content/public/browser/notification_service.h" @@ -58,6 +59,17 @@ ChromeGoogleURLTrackerClient::GetRequestContext() { return profile_->GetRequestContext(); } +bool ChromeGoogleURLTrackerClient::IsGoogleDomainURL(const GURL& url) { + return google_util::IsGoogleDomainUrl( + url, + google_util::DISALLOW_SUBDOMAIN, + google_util::DISALLOW_NON_STANDARD_PORTS); +} + +GURL ChromeGoogleURLTrackerClient::AppendGoogleLocaleParam(const GURL& url) { + return google_util::AppendGoogleLocaleParam(url); +} + void ChromeGoogleURLTrackerClient::Observe( int type, const content::NotificationSource& source, |