Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(56)

Side by Side Diff: chrome/android/java/src/org/chromium/chrome/browser/omnibox/LocationBarLayout.java

Issue 1821003003: [Offline pages] Fixing disappearing bolt when switching from incognito (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Simplifying the patch based on offline discussion Created 4 years, 9 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 package org.chromium.chrome.browser.omnibox; 5 package org.chromium.chrome.browser.omnibox;
6 6
7 import static org.chromium.chrome.browser.toolbar.ToolbarPhone.URL_FOCUS_CHANGE_ ANIMATION_DURATION_MS; 7 import static org.chromium.chrome.browser.toolbar.ToolbarPhone.URL_FOCUS_CHANGE_ ANIMATION_DURATION_MS;
8 8
9 import android.Manifest; 9 import android.Manifest;
10 import android.animation.Animator; 10 import android.animation.Animator;
(...skipping 1238 matching lines...) Expand 10 before | Expand all | Expand 10 after
1249 break; 1249 break;
1250 case EMPTY: 1250 case EMPTY:
1251 mNavigationButton.setImageDrawable(null); 1251 mNavigationButton.setImageDrawable(null);
1252 break; 1252 break;
1253 case OFFLINE: 1253 case OFFLINE:
1254 Drawable bolt = ApiCompatibilityUtils.getDrawable( 1254 Drawable bolt = ApiCompatibilityUtils.getDrawable(
1255 getResources(), R.drawable.offline_bolt); 1255 getResources(), R.drawable.offline_bolt);
1256 bolt.setColorFilter(ApiCompatibilityUtils.getColor(getResources( ), mUseDarkColors 1256 bolt.setColorFilter(ApiCompatibilityUtils.getColor(getResources( ), mUseDarkColors
1257 ? R.color.locationbar_status_color 1257 ? R.color.locationbar_status_color
1258 : R.color.locationbar_status_color_light), PorterDuff.Mo de.SRC_IN); 1258 : R.color.locationbar_status_color_light), PorterDuff.Mo de.SRC_IN);
1259 bolt.mutate();
1259 mNavigationButton.setImageDrawable(bolt); 1260 mNavigationButton.setImageDrawable(bolt);
1260 break; 1261 break;
1261 default: 1262 default:
1262 assert false; 1263 assert false;
1263 } 1264 }
1264 1265
1265 if (mNavigationButton.getVisibility() != VISIBLE) { 1266 if (mNavigationButton.getVisibility() != VISIBLE) {
1266 mNavigationButton.setVisibility(VISIBLE); 1267 mNavigationButton.setVisibility(VISIBLE);
1267 } 1268 }
1268 mNavigationButtonType = buttonType; 1269 mNavigationButtonType = buttonType;
(...skipping 1123 matching lines...) Expand 10 before | Expand all | Expand 10 after
2392 public View getContainerView() { 2393 public View getContainerView() {
2393 return this; 2394 return this;
2394 } 2395 }
2395 2396
2396 @Override 2397 @Override
2397 public void setTitleToPageTitle() { } 2398 public void setTitleToPageTitle() { }
2398 2399
2399 @Override 2400 @Override
2400 public void setShowTitle(boolean showTitle) { } 2401 public void setShowTitle(boolean showTitle) { }
2401 } 2402 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698