diff options
| author | Megan Jablonski <megjablon@chromium.org> | 2016-03-15 11:24:32 -0700 |
|---|---|---|
| committer | Megan Jablonski <megjablon@chromium.org> | 2016-03-15 18:27:34 +0000 |
| commit | 064272d4a1867565bf48bdaae4b8223b1bb38e19 (patch) | |
| tree | 7df3ff236ed1baf932dcb2a48a1de6233686d676 | |
| parent | 81c1f124a8a6258f075b51b474abaf3bd9ce4d09 (diff) | |
| download | chromium_src-064272d4a1867565bf48bdaae4b8223b1bb38e19.zip chromium_src-064272d4a1867565bf48bdaae4b8223b1bb38e19.tar.gz chromium_src-064272d4a1867565bf48bdaae4b8223b1bb38e19.tar.bz2 | |
Don't create a LoFiBarPopupController if SnackbarManager is null
BUG=594381
Review URL: https://codereview.chromium.org/1803823002
Cr-Commit-Position: refs/heads/master@{#381078}
(cherry picked from commit e08672445f26f16bf7ed5f217447140cb2f3311a)
Review URL: https://codereview.chromium.org/1805093002 .
Cr-Commit-Position: refs/branch-heads/2661@{#242}
Cr-Branched-From: ef6f6ae5e4c96622286b563658d5cd62a6cf1197-refs/heads/master@{#378081}
| -rw-r--r-- | chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java | 6 |
1 files changed, 4 insertions, 2 deletions
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 baedef1..10b84c9 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 @@ -565,8 +565,10 @@ public final class Tab implements ViewGroup.OnHierarchyChangeListener, mWindowAndroid = window; mLaunchType = type; if (mThemedApplicationContext != null) { - mLoFiBarPopupController = new LoFiBarPopupController( - mThemedApplicationContext, getSnackbarManager()); + if (getSnackbarManager() != null) { + mLoFiBarPopupController = new LoFiBarPopupController( + mThemedApplicationContext, getSnackbarManager()); + } Resources resources = mThemedApplicationContext.getResources(); mIdealFaviconSize = resources.getDimensionPixelSize(R.dimen.default_favicon_size); mDefaultThemeColor = mIncognito |