Chromium Code Reviews| Index: content/browser/frame_host/render_frame_host_impl.h |
| diff --git a/content/browser/frame_host/render_frame_host_impl.h b/content/browser/frame_host/render_frame_host_impl.h |
| index 162ed2080ccf73f4672db16266a662a6e40bfe41..ebe19375da15fd5eac477ad3204835bf73fd6ea9 100644 |
| --- a/content/browser/frame_host/render_frame_host_impl.h |
| +++ b/content/browser/frame_host/render_frame_host_impl.h |
| @@ -106,6 +106,10 @@ struct FrameOwnerProperties; |
| struct FileChooserParams; |
| struct ResourceResponse; |
| +#if defined(OS_ANDROID) |
| +class RenderFrameHostAndroid; |
| +#endif |
| + |
| namespace mojom { |
| class CreateNewWindowParams; |
| } |
| @@ -624,6 +628,11 @@ class CONTENT_EXPORT RenderFrameHostImpl |
| return has_focused_editable_element_; |
| } |
| +#if defined(OS_ANDROID) |
| + base::android::ScopedJavaLocalRef<jobject> GetJavaRenderFrameHost(); |
| + RenderFrameHostAndroid* GetRenderFrameHostAndroid(); |
|
please use gerrit instead
2017/02/14 18:31:10
Let's remove GetRenderFrameHostAndroid() and use r
rwlbuis
2017/02/14 19:26:27
Done.
|
| +#endif |
| + |
| protected: |
| friend class RenderFrameHostFactory; |
| @@ -1165,6 +1174,9 @@ class CONTENT_EXPORT RenderFrameHostImpl |
| // Tracks the feature policy which has been set on this frame. |
| std::unique_ptr<FeaturePolicy> feature_policy_; |
| +#if defined(OS_ANDROID) |
| + RenderFrameHostAndroid* render_frame_host_android_; |
| +#endif |
| // NOTE: This must be the last member. |
| base::WeakPtrFactory<RenderFrameHostImpl> weak_ptr_factory_; |