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

Side by Side 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, 3 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 unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef BLIMP_CLIENT_CORE_CONTENTS_BLIMP_CONTENTS_VIEW_ANDROID_H_ 5 #ifndef BLIMP_CLIENT_CORE_CONTENTS_BLIMP_CONTENTS_VIEW_ANDROID_H_
6 #define BLIMP_CLIENT_CORE_CONTENTS_BLIMP_CONTENTS_VIEW_ANDROID_H_ 6 #define BLIMP_CLIENT_CORE_CONTENTS_BLIMP_CONTENTS_VIEW_ANDROID_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "blimp/client/core/contents/blimp_contents_view.h" 9 #include "blimp/client/core/contents/blimp_contents_view.h"
10 #include "ui/android/view_android.h" 10 #include "ui/android/view_android.h"
11 11
12 namespace blimp { 12 namespace blimp {
13 namespace client { 13 namespace client {
14 class BlimpContentsImplAndroid; 14 class BlimpContentsImpl;
15 class BlimpView;
15 16
16 class BlimpContentsViewAndroid : public BlimpContentsView { 17 class BlimpContentsViewAndroid : public BlimpContentsView {
17 public: 18 public:
18 explicit BlimpContentsViewAndroid(BlimpContentsImplAndroid* blimp_contents, 19 BlimpContentsViewAndroid(BlimpContentsImpl* blimp_contents,
19 scoped_refptr<cc::Layer> contents_layer); 20 scoped_refptr<cc::Layer> contents_layer);
21 ~BlimpContentsViewAndroid() override;
20 22
21 // BlimpContentsView implementation. 23 // BlimpContentsView implementation.
22 gfx::NativeView GetNativeView() override; 24 gfx::NativeView GetNativeView() override;
23 25
26 // Returns the JNI-bridge for the Android View for this BlimpContentsView.
27 BlimpView* GetBlimpView();
28
24 private: 29 private:
25 ui::ViewAndroid view_; 30 std::unique_ptr<ui::ViewAndroid> view_;
31
32 // The JNI-bridge for the Android View for this BlimpContentsView.
33 std::unique_ptr<BlimpView> blimp_view_;
26 34
27 DISALLOW_COPY_AND_ASSIGN(BlimpContentsViewAndroid); 35 DISALLOW_COPY_AND_ASSIGN(BlimpContentsViewAndroid);
28 }; 36 };
29 37
30 } // namespace client 38 } // namespace client
31 } // namespace blimp 39 } // namespace blimp
32 40
33 #endif // BLIMP_CLIENT_CORE_CONTENTS_BLIMP_CONTENTS_VIEW_ANDROID_H_ 41 #endif // BLIMP_CLIENT_CORE_CONTENTS_BLIMP_CONTENTS_VIEW_ANDROID_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698