Chromium Code Reviews| OLD | NEW |
|---|---|
| 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.toolbar; | 5 package org.chromium.chrome.browser.toolbar; |
| 6 | 6 |
| 7 import android.animation.Animator; | 7 import android.animation.Animator; |
| 8 import android.animation.AnimatorListenerAdapter; | 8 import android.animation.AnimatorListenerAdapter; |
| 9 import android.animation.ValueAnimator; | 9 import android.animation.ValueAnimator; |
| 10 import android.animation.ValueAnimator.AnimatorUpdateListener; | 10 import android.animation.ValueAnimator.AnimatorUpdateListener; |
| (...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 238 public int getTabStripHeight() { | 238 public int getTabStripHeight() { |
| 239 return 0; | 239 return 0; |
| 240 } | 240 } |
| 241 | 241 |
| 242 @Override | 242 @Override |
| 243 public Tab getCurrentTab() { | 243 public Tab getCurrentTab() { |
| 244 return getToolbarDataProvider().getTab(); | 244 return getToolbarDataProvider().getTab(); |
| 245 } | 245 } |
| 246 | 246 |
| 247 @Override | 247 @Override |
| 248 public boolean isIncognito() { | |
| 249 return super.isIncognito(); | |
|
Changwan Ryu
2017/05/23 18:54:23
Hmm.. We probably don't need this?
Ted C
2017/05/23 19:17:55
The super version is protected and the interface r
| |
| 250 } | |
| 251 | |
| 252 @Override | |
| 248 public boolean shouldEmphasizeHttpsScheme() { | 253 public boolean shouldEmphasizeHttpsScheme() { |
| 249 int securityLevel = getSecurityLevel(); | 254 int securityLevel = getSecurityLevel(); |
| 250 return securityLevel == ConnectionSecurityLevel.DANGEROUS | 255 return securityLevel == ConnectionSecurityLevel.DANGEROUS |
| 251 || securityLevel == ConnectionSecurityLevel.SECURE_WITH_POLICY_I NSTALLED_CERT; | 256 || securityLevel == ConnectionSecurityLevel.SECURE_WITH_POLICY_I NSTALLED_CERT; |
| 252 } | 257 } |
| 253 | 258 |
| 254 @Override | 259 @Override |
| 255 public void setShowTitle(boolean showTitle) { | 260 public void setShowTitle(boolean showTitle) { |
| 256 if (showTitle) { | 261 if (showTitle) { |
| 257 mState = STATE_DOMAIN_AND_TITLE; | 262 mState = STATE_DOMAIN_AND_TITLE; |
| (...skipping 486 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 744 public View getMenuButtonWrapper() { | 749 public View getMenuButtonWrapper() { |
| 745 // This class has no menu button wrapper, so return the menu button inst ead. | 750 // This class has no menu button wrapper, so return the menu button inst ead. |
| 746 return mMenuButton; | 751 return mMenuButton; |
| 747 } | 752 } |
| 748 | 753 |
| 749 @Override | 754 @Override |
| 750 public boolean mustQueryUrlBarLocationForSuggestions() { | 755 public boolean mustQueryUrlBarLocationForSuggestions() { |
| 751 return false; | 756 return false; |
| 752 } | 757 } |
| 753 } | 758 } |
| OLD | NEW |