chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerDocument.java - Issue 2623023002: Remove //chrome as an embedder of blimp.

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 2623023002: Remove //chrome as an embedder of blimp. (Closed)

Patch Set: One more rebase for good measure Created 3 years, 11 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/blimp/ui/BlimpMessageBuilder.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/feedback/FeedbackCollector.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 d8c03040715dfa228d56822a4acc828df2a68a8c..8facc5d228deac4a88dab801d3129aa08354494d 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

@@ -259,17 +259,13 @@ public class LayoutManagerDocument extends LayoutManager

String url = tab.getUrl();

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

int themeColor = tab.getThemeColor();

- // 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 canUseLiveTexture =

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

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

canUseLiveTexture, themeColor, ColorUtils.getTextBoxColorForToolbarBackground(

- mContext.getResources(), tab, themeColor),

+ mContext.getResources(), tab, themeColor),

ColorUtils.getTextBoxAlphaForToolbarBackground(tab));

if (needsUpdate) requestUpdate();