chrome/browser/ui/android/toolbar/toolbar_model_android.cc - Issue 1100763002: Inject CanAddURLToHistory into TopSitesImpl

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/android/toolbar/toolbar_model_android.cc

Issue 1100763002: Inject CanAddURLToHistory into TopSitesImpl (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@prefs

Patch Set: Fix error introduced during rebase Created 5 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: chrome/browser/ui/android/toolbar/toolbar_model_android.cc

diff --git a/chrome/browser/ui/android/toolbar/toolbar_model_android.cc b/chrome/browser/ui/android/toolbar/toolbar_model_android.cc

index 3990d36e90524cce104ef0956270879f0f41bc58..2884faf535c765244e53fa8c79cbf10a5db5d65c 100644

--- a/chrome/browser/ui/android/toolbar/toolbar_model_android.cc

+++ b/chrome/browser/ui/android/toolbar/toolbar_model_android.cc

@@ -117,11 +117,7 @@ jboolean IsDeprecatedSHA1Present(JNIEnv* env,

static const int64_t kJanuary2016 = INT64_C(13096080000000000);

if (content::CertStore::GetInstance()->RetrieveCert(ssl.cert_id, &cert) &&

(ssl.cert_status & net::CERT_STATUS_SHA1_SIGNATURE_PRESENT) &&

- cert->valid_expiry() > base::Time::FromInternalValue(kJanuary2016) &&

- // NOTE: This use of SHA1IdentityUIWarning needs to be kept in sync

- // with WebsiteSettings::Init().

- base::FieldTrialList::FindFullName("SHA1IdentityUIWarning") ==

- "Enabled") {

+ cert->valid_expiry() > base::Time::FromInternalValue(kJanuary2016)) {

return true;

}