Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(205)

Unified Diff: content/browser/android/content_view_core_impl.h

Issue 2453213003: Have WebContentsViewAndroid own ViewAndroid (Closed)
Patch Set: fixed builds & rebased Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | content/browser/android/content_view_core_impl.cc » ('j') | ui/android/view_android.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 d6d59416812068c0b82d2601c5cccf3c1b96da9c..b49da8c5aa0276567e07f2995d3054067e17f5ea 100644
--- a/content/browser/android/content_view_core_impl.h
+++ b/content/browser/android/content_view_core_impl.h
@@ -54,8 +54,6 @@ class ContentViewCoreImpl : public ContentViewCore,
JNIEnv* env,
const base::android::JavaRef<jobject>& obj,
WebContents* web_contents,
- const base::android::JavaRef<jobject>& view_android_delegate,
- ui::WindowAndroid* window_android,
const base::android::JavaRef<jobject>& java_bridge_retained_object_set);
// ContentViewCore implementation.
@@ -389,7 +387,7 @@ class ContentViewCoreImpl : public ContentViewCore,
void OnShowUnhandledTapUIIfNeeded(int x_dip, int y_dip);
- ui::ViewAndroid* GetViewAndroid();
+ ui::ViewAndroid* GetViewAndroid() const;
private:
class ContentViewUserData;
@@ -442,8 +440,6 @@ class ContentViewCoreImpl : public ContentViewCore,
// Select popup view
ui::ViewAndroid::ScopedAnchorView select_popup_;
- ui::ViewAndroid view_;
-
// Reference to the current WebContents used to determine how and what to
// display in the ContentViewCore.
WebContentsImpl* web_contents_;
« no previous file with comments | « no previous file | content/browser/android/content_view_core_impl.cc » ('j') | ui/android/view_android.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698