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

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java

Issue 2984453002: Add Browser Actions tab model selector and open a tab through it if ChromeTabbedActivity is not ava…
Patch Set: Sync changes. Created 3 years, 4 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
Index: chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java
index 5d6494848b3e4182ba86571a3344df92ff1f2fc1..cd6a933ded94bf65cbe791d928bd4653929eeafc 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java
@@ -491,12 +491,18 @@ public class Tab
mWindowAndroid = window;
mLaunchType = type;
if (mLaunchType == TabLaunchType.FROM_DETACHED) mIsDetached = true;
- Resources resources = mThemedApplicationContext.getResources();
- mIdealFaviconSize = resources.getDimensionPixelSize(R.dimen.default_favicon_size);
- mDefaultThemeColor = mIncognito
- ? ApiCompatibilityUtils.getColor(resources, R.color.incognito_primary_color)
- : ApiCompatibilityUtils.getColor(resources, R.color.default_primary_color);
- mThemeColor = calculateThemeColor(false);
+ if (mThemedApplicationContext != null) {
+ Resources resources = mThemedApplicationContext.getResources();
+ mIdealFaviconSize = resources.getDimensionPixelSize(R.dimen.default_favicon_size);
+ mDefaultThemeColor = mIncognito
+ ? ApiCompatibilityUtils.getColor(resources, R.color.incognito_primary_color)
+ : ApiCompatibilityUtils.getColor(resources, R.color.default_primary_color);
+ mThemeColor = calculateThemeColor(false);
+ } else {
+ mIdealFaviconSize = 16;
+ mDefaultThemeColor = 0;
+ mThemeColor = mDefaultThemeColor;
+ }
// Restore data from the TabState, if it existed.
if (frozenState != null) {
@@ -1288,7 +1294,6 @@ public class Tab
} else {
setContentViewCore(contentViewCore);
}
-
mContentViewCore.addImeEventObserver(new ImeEventObserver() {
@Override
public void onImeEvent() {
@@ -1308,7 +1313,6 @@ public class Tab
if (!creatingWebContents && webContents.isLoadingToDifferentDocument()) {
didStartPageLoad(webContents.getVisibleUrl(), false);
}
-
getAppBannerManager().setIsEnabledForTab(mDelegateFactory.canShowAppBanners(this));
} finally {
if (mTimestampMillis == INVALID_TIMESTAMP) {

Powered by Google App Engine
This is Rietveld 408576698