| Index: blimp/client/core/contents/blimp_contents_view_android.cc
|
| diff --git a/blimp/client/core/contents/blimp_contents_view_android.cc b/blimp/client/core/contents/blimp_contents_view_android.cc
|
| index ce32fc5369d61da8493629cc329c3a53c4d34cf8..42f58be068b3b9a014b994edec6931b6b40736a8 100644
|
| --- a/blimp/client/core/contents/blimp_contents_view_android.cc
|
| +++ b/blimp/client/core/contents/blimp_contents_view_android.cc
|
| @@ -6,6 +6,7 @@
|
|
|
| #include "base/memory/ptr_util.h"
|
| #include "blimp/client/core/contents/android/blimp_contents_impl_android.h"
|
| +#include "blimp/client/core/contents/android/ime_helper_dialog.h"
|
| #include "cc/layers/layer.h"
|
|
|
| namespace blimp {
|
| @@ -19,18 +20,28 @@ std::unique_ptr<BlimpContentsView> BlimpContentsView::Create(
|
| }
|
|
|
| BlimpContentsViewAndroid::BlimpContentsViewAndroid(
|
| - BlimpContentsImplAndroid* blimp_contents) {
|
| + BlimpContentsImplAndroid* blimp_contents)
|
| + : ime_dialog_(new ImeHelperDialog(blimp_contents->blimp_contents_impl()
|
| + ->GetNativeView()
|
| + ->GetWindowAndroid())) {
|
| // TODO(khushalsagar): Get the ViewAndroidDelegate from java after it has a
|
| // BlimpView. Also get the WindowAndroid so this view can add itself as a
|
| // child to it.
|
| // TODO(dtrainor): Use the layer from the compositor manager here instead when
|
| // it goes in the BlimpContents.
|
| view_.SetLayer(cc::Layer::Create());
|
| + ime_dialog_.reset(new ImeHelperDialog(view_.GetWindowAndroid()));
|
| }
|
|
|
| +BlimpContentsViewAndroid::~BlimpContentsViewAndroid() {}
|
| +
|
| gfx::NativeView BlimpContentsViewAndroid::GetNativeView() {
|
| return &view_;
|
| }
|
|
|
| +ImeFeature::Delegate* BlimpContentsViewAndroid::GetImeDelegate() {
|
| + return ime_dialog_.get();
|
| +}
|
| +
|
| } // namespace client
|
| } // namespace blimp
|
|
|