| Index: chrome/android/java/src/org/chromium/chrome/browser/banners/SwipableOverlayView.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/banners/SwipableOverlayView.java b/chrome/android/java/src/org/chromium/chrome/browser/banners/SwipableOverlayView.java
|
| index efffabe0c4afac082c66b947902c963bf68e4894..babdce53210f925887ae7f713c5a3738d1fd3f46 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/banners/SwipableOverlayView.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/banners/SwipableOverlayView.java
|
| @@ -18,7 +18,6 @@ import android.view.animation.DecelerateInterpolator;
|
| import android.view.animation.Interpolator;
|
| import android.widget.FrameLayout;
|
|
|
| -import org.chromium.chrome.browser.tab.TabContentViewParent;
|
| import org.chromium.content.browser.ContentViewCore;
|
| import org.chromium.content_public.browser.GestureStateListener;
|
|
|
| @@ -137,9 +136,10 @@ public abstract class SwipableOverlayView extends FrameLayout {
|
| return mContentViewCore;
|
| }
|
|
|
| - protected void addToParentView(TabContentViewParent parentView) {
|
| + protected void addToParentView(ViewGroup parentView) {
|
| + if (parentView == null) return;
|
| if (getParent() == null) {
|
| - parentView.addInfobarView(this, createLayoutParams());
|
| + parentView.addView(this, createLayoutParams());
|
|
|
| // Listen for the layout to know when to animate the View coming onto the screen.
|
| addOnLayoutChangeListener(mLayoutChangeListener);
|
|
|