Chromium Code Reviews| Index: content/browser/web_contents/web_contents_view_android.cc |
| diff --git a/content/browser/web_contents/web_contents_view_android.cc b/content/browser/web_contents/web_contents_view_android.cc |
| index 37db35ebb153447b2336787d625d017cc13a5e5e..118d58e62d59705b8db9fb43529a2541c176fbf6 100644 |
| --- a/content/browser/web_contents/web_contents_view_android.cc |
| +++ b/content/browser/web_contents/web_contents_view_android.cc |
| @@ -81,10 +81,10 @@ WebContentsViewAndroid::WebContentsViewAndroid( |
| WebContentsImpl* web_contents, |
| WebContentsViewDelegate* delegate) |
| : web_contents_(web_contents), |
| - content_view_core_(NULL), |
| + content_view_core_(nullptr), |
| + overscroll_refresh_handler_(nullptr), |
|
Jinsuk Kim
2016/11/25 01:49:18
The signature in the header hasn't changed. Maybe
rlanday
2016/11/28 21:17:51
Sorry, I'm a little confused here; I did add a set
Jinsuk Kim
2016/11/28 23:06:40
Acknowledged.
|
| delegate_(delegate), |
| - synchronous_compositor_client_(nullptr) { |
| -} |
| + synchronous_compositor_client_(nullptr) {} |
| WebContentsViewAndroid::~WebContentsViewAndroid() { |
| if (view_.GetLayer()) |
| @@ -217,8 +217,8 @@ RenderWidgetHostViewBase* WebContentsViewAndroid::CreateViewForWidget( |
| // order to paint it. See ContentView::GetRenderWidgetHostViewAndroid for an |
| // example of how this is achieved for InterstitialPages. |
| RenderWidgetHostImpl* rwhi = RenderWidgetHostImpl::From(render_widget_host); |
| - RenderWidgetHostViewAndroid* rwhv = |
| - new RenderWidgetHostViewAndroid(rwhi, content_view_core_); |
| + RenderWidgetHostViewAndroid* rwhv = new RenderWidgetHostViewAndroid( |
| + rwhi, content_view_core_, overscroll_refresh_handler_); |
| rwhv->SetSynchronousCompositorClient(synchronous_compositor_client_); |
| return rwhv; |
| } |
| @@ -226,7 +226,7 @@ RenderWidgetHostViewBase* WebContentsViewAndroid::CreateViewForWidget( |
| RenderWidgetHostViewBase* WebContentsViewAndroid::CreateViewForPopupWidget( |
| RenderWidgetHost* render_widget_host) { |
| RenderWidgetHostImpl* rwhi = RenderWidgetHostImpl::From(render_widget_host); |
| - return new RenderWidgetHostViewAndroid(rwhi, NULL); |
| + return new RenderWidgetHostViewAndroid(rwhi, nullptr, nullptr); |
| } |
| void WebContentsViewAndroid::RenderViewCreated(RenderViewHost* host) { |