chrome/android/java/src/org/chromium/chrome/browser/toolbar/CustomTabToolbar.java - Issue 1411783009: Revert of Roll android_tools deps

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/android/java/src/org/chromium/chrome/browser/toolbar/CustomTabToolbar.java

Issue 1411783009: Revert of Roll android_tools deps (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 2 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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleCategoryPreferences.java ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/toolbar/CustomTabToolbar.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/CustomTabToolbar.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/CustomTabToolbar.java

index 49b02da41f1fe27ed841a4a81e63f8a93ed7da23..df87a09926dabf3895d2d38413d570e6cbe6a871 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/CustomTabToolbar.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/CustomTabToolbar.java

@@ -367,14 +367,9 @@

if (securityLevel == ConnectionSecurityLevel.NONE) {

mAnimDelegate.hideSecurityButton();

} else {

- int id = LocationBarLayout.getSecurityIconResource(

- securityLevel, !shouldEmphasizeHttpsScheme());

// ImageView#setImageResource is no-op if given resource is the current one.

- if (id == 0) {

- mSecurityButton.setImageDrawable(null);

- } else {

- mSecurityButton.setImageResource(id);

- }

+ mSecurityButton.setImageResource(LocationBarLayout.getSecurityIconResource(

+ securityLevel, !shouldEmphasizeHttpsScheme()));

mAnimDelegate.showSecurityButton();

}

mUrlBar.emphasizeUrl();

« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleCategoryPreferences.java ('k') | no next file » | no next file with comments »