| Index: content/browser/android/content_view_core_impl.h
|
| diff --git a/content/browser/android/content_view_core_impl.h b/content/browser/android/content_view_core_impl.h
|
| index 60fe8fb1741dd2d59f7ed5c0001c713f4d8a2d4b..45570fe7910f49d0bf2a23ce0bbfb4071f9bf582 100644
|
| --- a/content/browser/android/content_view_core_impl.h
|
| +++ b/content/browser/android/content_view_core_impl.h
|
| @@ -36,7 +36,8 @@ class ContentViewCoreImpl : public ContentViewCore,
|
| jobject obj,
|
| bool hardware_accelerated,
|
| bool take_ownership_of_web_contents,
|
| - WebContents* web_contents);
|
| + WebContents* web_contents,
|
| + WindowAndroid* window_android);
|
|
|
| // ContentViewCore overrides
|
| virtual void Destroy(JNIEnv* env, jobject obj) OVERRIDE;
|
| @@ -169,6 +170,7 @@ class ContentViewCoreImpl : public ContentViewCore,
|
| WebContents* web_contents() const { return web_contents_; }
|
|
|
| virtual void LoadUrl(NavigationController::LoadURLParams& params) OVERRIDE;
|
| + virtual WindowAndroid* GetWindowAndroid() OVERRIDE;
|
|
|
| private:
|
| // NotificationObserver implementation.
|
| @@ -215,6 +217,8 @@ class ContentViewCoreImpl : public ContentViewCore,
|
| // Whether the renderer backing this ContentViewCore has crashed.
|
| bool tab_crashed_;
|
|
|
| + WindowAndroid* window_android_;
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(ContentViewCoreImpl);
|
| };
|
|
|
|
|