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

Unified Diff: blimp/client/core/contents/blimp_contents_view_android.h

Issue 2270323004: Add BlimpView to a Chrome tab when Blimp is enabled. (Closed)
Patch Set: addressed nit, renamed CreateForTesting and piped through touch handling Created 4 years, 4 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: blimp/client/core/contents/blimp_contents_view_android.h
diff --git a/blimp/client/core/contents/blimp_contents_view_android.h b/blimp/client/core/contents/blimp_contents_view_android.h
index 9f087249a704b838b9d6146a16bd0155af11d832..08b9af22c3c69c3ddaad06ac5246a092a576a4dd 100644
--- a/blimp/client/core/contents/blimp_contents_view_android.h
+++ b/blimp/client/core/contents/blimp_contents_view_android.h
@@ -11,18 +11,26 @@
namespace blimp {
namespace client {
-class BlimpContentsImplAndroid;
+class BlimpContentsImpl;
+class BlimpView;
class BlimpContentsViewAndroid : public BlimpContentsView {
public:
- explicit BlimpContentsViewAndroid(BlimpContentsImplAndroid* blimp_contents,
- scoped_refptr<cc::Layer> contents_layer);
+ BlimpContentsViewAndroid(BlimpContentsImpl* blimp_contents,
+ scoped_refptr<cc::Layer> contents_layer);
+ ~BlimpContentsViewAndroid() override;
// BlimpContentsView implementation.
gfx::NativeView GetNativeView() override;
+ // Returns the JNI-bridge for the Android View for this BlimpContentsView.
+ BlimpView* GetBlimpView();
+
private:
- ui::ViewAndroid view_;
+ std::unique_ptr<ui::ViewAndroid> view_;
+
+ // The JNI-bridge for the Android View for this BlimpContentsView.
+ std::unique_ptr<BlimpView> blimp_view_;
DISALLOW_COPY_AND_ASSIGN(BlimpContentsViewAndroid);
};

Powered by Google App Engine
This is Rietveld 408576698