Commit c99cbb2f authored by Matthew Jones's avatar Matthew Jones Committed by Commit Bot

Fix incognito tab titles on tablet

This patch adds a check for tablet in the logic that decides whether
a light or dark title is used.

Bug: 891666
Change-Id: I6f05aa06ef01cd67a1f58a12e6f7436debe74e6b
Reviewed-on: https://chromium-review.googlesource.com/1259285Reviewed-by: default avatarYusuf Ozuysal <yusufo@chromium.org>
Commit-Queue: Matthew Jones <mdjones@chromium.org>
Cr-Commit-Position: refs/heads/master@{#596303}
parent 56f8dfd0
...@@ -21,6 +21,7 @@ import org.chromium.chrome.browser.favicon.FaviconHelper.FaviconImageCallback; ...@@ -21,6 +21,7 @@ import org.chromium.chrome.browser.favicon.FaviconHelper.FaviconImageCallback;
import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.profiles.Profile;
import org.chromium.chrome.browser.tab.Tab; import org.chromium.chrome.browser.tab.Tab;
import org.chromium.chrome.browser.tabmodel.TabModelSelector; import org.chromium.chrome.browser.tabmodel.TabModelSelector;
import org.chromium.ui.base.DeviceFormFactor;
import org.chromium.ui.resources.ResourceManager; import org.chromium.ui.resources.ResourceManager;
import org.chromium.ui.resources.dynamics.BitmapDynamicResource; import org.chromium.ui.resources.dynamics.BitmapDynamicResource;
import org.chromium.ui.resources.dynamics.DynamicResourceLoader; import org.chromium.ui.resources.dynamics.DynamicResourceLoader;
...@@ -121,8 +122,9 @@ public class LayerTitleCache implements TitleCache { ...@@ -121,8 +122,9 @@ public class LayerTitleCache implements TitleCache {
private String getUpdatedTitleInternal(Tab tab, String titleString, private String getUpdatedTitleInternal(Tab tab, String titleString,
boolean fetchFaviconFromHistory) { boolean fetchFaviconFromHistory) {
final int tabId = tab.getId(); final int tabId = tab.getId();
boolean isDarkTheme = tab.isIncognito() boolean isHTSEnabled = !DeviceFormFactor.isNonMultiDisplayContextOnTablet(tab.getActivity())
&& !ChromeFeatureList.isEnabled(ChromeFeatureList.HORIZONTAL_TAB_SWITCHER_ANDROID); && ChromeFeatureList.isEnabled(ChromeFeatureList.HORIZONTAL_TAB_SWITCHER_ANDROID);
boolean isDarkTheme = tab.isIncognito() && !isHTSEnabled;
Bitmap originalFavicon = tab.getFavicon(); Bitmap originalFavicon = tab.getFavicon();
if (originalFavicon == null) { if (originalFavicon == null) {
originalFavicon = mDefaultFaviconHelper.getDefaultFaviconBitmap( originalFavicon = mDefaultFaviconHelper.getDefaultFaviconBitmap(
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment