chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerDocument.java - Issue 2325893002: [blimp] Add support for having multiple tabs

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/compositor/layouts/LayoutManagerDocument.java

Issue 2325893002: [blimp] Add support for having multiple tabs (Closed)

Patch Set: Add tablet and non-blimp support Created 4 years, 3 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/ChromeTabbedActivity.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelper.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerDocument.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerDocument.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerDocument.java

index 6794f2b1f86eb1063cbf2ea8889bab265971f2bb..1bce93c8cc1ec46c3f19a6e3f07496511bcd2e09 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerDocument.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerDocument.java

@@ -260,8 +260,14 @@ public class LayoutManagerDocument extends LayoutManager

String url = tab.getUrl();

boolean isNativePage = url != null && url.startsWith(UrlConstants.CHROME_NATIVE_SCHEME);

int themeColor = tab.getThemeColor();

- boolean canUseLiveTexture =

- tab.getContentViewCore() != null && !tab.isShowingSadTab() && !isNativePage;

+ // TODO(xingliu): Remove this override themeColor for Blimp tabs. See crbug.com/644774.

+ if (tab.isBlimpTab() && tab.getBlimpContents() != null) {

+ themeColor = tab.getBlimpContents().getThemeColor();

+ }

+ boolean canUseLiveTexture = tab.isBlimpTab()

+ || tab.getContentViewCore() != null && !tab.isShowingSadTab() && !isNativePage;

boolean needsUpdate = layoutTab.initFromHost(tab.getBackgroundColor(), tab.shouldStall(),

canUseLiveTexture, themeColor, ColorUtils.getTextBoxColorForToolbarBackground(

mContext.getResources(), tab, themeColor),