diff options
Diffstat (limited to 'chrome/browser/android')
4 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/android/history_report/delta_file_commons.cc b/chrome/browser/android/history_report/delta_file_commons.cc index d7d6cba..7f35cb6 100644 --- a/chrome/browser/android/history_report/delta_file_commons.cc +++ b/chrome/browser/android/history_report/delta_file_commons.cc @@ -110,7 +110,7 @@ std::string DeltaFileEntryWithData::Url() const { base::string16 DeltaFileEntryWithData::Title() const { if (!Valid()) return base::UTF8ToUTF16(""); if (is_bookmark_ && !bookmark_title_.empty()) return bookmark_title_; - if (data_.title().empty()) return base::UTF8ToUTF16(data_.url().host()); + if (data_.title().empty()) return base::UTF8ToUTF16(data_.url().host_piece()); return data_.title(); } diff --git a/chrome/browser/android/history_report/usage_report_util.cc b/chrome/browser/android/history_report/usage_report_util.cc index 0138426..c2c696e 100644 --- a/chrome/browser/android/history_report/usage_report_util.cc +++ b/chrome/browser/android/history_report/usage_report_util.cc @@ -41,7 +41,7 @@ bool ShouldIgnoreUrl(const GURL& url) { return true; // Ignore localhost URLs. - if (net::IsLocalhost(url.host())) + if (net::IsLocalhost(url.host_piece())) return true; return false; diff --git a/chrome/browser/android/tab_web_contents_delegate_android.cc b/chrome/browser/android/tab_web_contents_delegate_android.cc index d2a1e48..664328e 100644 --- a/chrome/browser/android/tab_web_contents_delegate_android.cc +++ b/chrome/browser/android/tab_web_contents_delegate_android.cc @@ -153,9 +153,9 @@ bool TabWebContentsDelegateAndroid::ShouldFocusLocationBarByDefault( GURL url = entry->GetURL(); GURL virtual_url = entry->GetVirtualURL(); if ((url.SchemeIs(chrome::kChromeUINativeScheme) && - url.host() == chrome::kChromeUINewTabHost) || + url.host_piece() == chrome::kChromeUINewTabHost) || (virtual_url.SchemeIs(chrome::kChromeUINativeScheme) && - virtual_url.host() == chrome::kChromeUINewTabHost)) { + virtual_url.host_piece() == chrome::kChromeUINewTabHost)) { return true; } } diff --git a/chrome/browser/android/url_utilities.cc b/chrome/browser/android/url_utilities.cc index 742cd09..1a3b673 100644 --- a/chrome/browser/android/url_utilities.cc +++ b/chrome/browser/android/url_utilities.cc @@ -52,7 +52,7 @@ static jboolean SameHost(JNIEnv* env, const JavaParamRef<jstring>& url_2_str) { GURL url_1 = ConvertJavaStringToGURL(env, url_1_str); GURL url_2 = ConvertJavaStringToGURL(env, url_2_str); - return url_1.host() == url_2.host(); + return url_1.host_piece() == url_2.host_piece(); } static ScopedJavaLocalRef<jstring> GetDomainAndRegistry( |