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

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

Issue 14018004: [Android] Refactor NativeView to be able to use it for AutofillDialog. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 8 months 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
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 ea0a263dc9b803ec264712269208a62dc9fdadf4..6355ceb75ea9307f4b01d18df1d460359bb3d39b 100644
--- a/content/browser/android/content_view_core_impl.h
+++ b/content/browser/android/content_view_core_impl.h
@@ -26,6 +26,7 @@
struct WebMenuItem;
namespace ui {
+class ViewAndroid;
class WindowAndroid;
}
@@ -43,13 +44,13 @@ class ContentViewCoreImpl : public ContentViewCore,
bool hardware_accelerated,
bool input_events_delivered_at_vsync,
WebContents* web_contents,
+ ui::ViewAndroid* view_android,
ui::WindowAndroid* window_android);
// ContentViewCore implementation.
virtual base::android::ScopedJavaLocalRef<jobject> GetJavaObject() OVERRIDE;
- virtual base::android::ScopedJavaLocalRef<jobject> GetContainerViewDelegate()
- OVERRIDE;
virtual WebContents* GetWebContents() const OVERRIDE;
+ virtual ui::ViewAndroid* GetViewAndroid() const OVERRIDE;
virtual ui::WindowAndroid* GetWindowAndroid() const OVERRIDE;
virtual scoped_refptr<cc::Layer> GetLayer() const OVERRIDE;
virtual void LoadUrl(NavigationController::LoadURLParams& params) OVERRIDE;
@@ -342,6 +343,10 @@ class ContentViewCoreImpl : public ContentViewCore,
// Device scale factor.
float dpi_scale_;
+ // The Android view that can be used to add and remove decoration layers
+ // like AutofillPopup.
+ ui::ViewAndroid* view_android_;
+
// The owning window that has a hold of main application activity.
ui::WindowAndroid* window_android_;
« no previous file with comments | « chrome/browser/ui/android/autofill/autofill_popup_view_android.cc ('k') | content/browser/android/content_view_core_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698