| Index: blimp/client/core/contents/blimp_contents_view_impl_android.cc
|
| diff --git a/blimp/client/core/contents/blimp_contents_view_android.cc b/blimp/client/core/contents/blimp_contents_view_impl_android.cc
|
| similarity index 54%
|
| rename from blimp/client/core/contents/blimp_contents_view_android.cc
|
| rename to blimp/client/core/contents/blimp_contents_view_impl_android.cc
|
| index 8d5860a26adb37acb8b44cde54c69b105514a265..ee92657535fbdba39d2e31b5aaf073fac1ae2bc4 100644
|
| --- a/blimp/client/core/contents/blimp_contents_view_android.cc
|
| +++ b/blimp/client/core/contents/blimp_contents_view_impl_android.cc
|
| @@ -2,7 +2,7 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "blimp/client/core/contents/blimp_contents_view_android.h"
|
| +#include "blimp/client/core/contents/blimp_contents_view_impl_android.h"
|
|
|
| #include "base/memory/ptr_util.h"
|
| #include "blimp/client/core/contents/android/blimp_view.h"
|
| @@ -15,35 +15,37 @@ namespace blimp {
|
| namespace client {
|
|
|
| // static
|
| -std::unique_ptr<BlimpContentsView> BlimpContentsView::Create(
|
| +std::unique_ptr<BlimpContentsViewImpl> BlimpContentsViewImpl::Create(
|
| BlimpContentsImpl* blimp_contents,
|
| scoped_refptr<cc::Layer> contents_layer) {
|
| - return base::MakeUnique<BlimpContentsViewAndroid>(blimp_contents,
|
| - contents_layer);
|
| + return base::MakeUnique<BlimpContentsViewImplAndroid>(blimp_contents,
|
| + contents_layer);
|
| }
|
|
|
| -BlimpContentsViewAndroid::BlimpContentsViewAndroid(
|
| +BlimpContentsViewImplAndroid::BlimpContentsViewImplAndroid(
|
| BlimpContentsImpl* blimp_contents,
|
| scoped_refptr<cc::Layer> contents_layer)
|
| - : ime_dialog_(new ImeHelperDialog(blimp_contents->GetNativeWindow())) {
|
| - blimp_view_ = base::MakeUnique<BlimpView>(blimp_contents);
|
| + : BlimpContentsViewImpl(blimp_contents, contents_layer),
|
| + ime_dialog_(new ImeHelperDialog(blimp_contents->GetNativeWindow())) {
|
| + blimp_view_ =
|
| + base::MakeUnique<BlimpView>(blimp_contents->GetNativeWindow(), this);
|
| view_ = base::MakeUnique<ui::ViewAndroid>(
|
| blimp_view_->CreateViewAndroidDelegate());
|
| view_->SetLayer(contents_layer);
|
| blimp_contents->GetNativeWindow()->AddChild(view_.get());
|
| }
|
|
|
| -BlimpContentsViewAndroid::~BlimpContentsViewAndroid() = default;
|
| +BlimpContentsViewImplAndroid::~BlimpContentsViewImplAndroid() = default;
|
|
|
| -gfx::NativeView BlimpContentsViewAndroid::GetNativeView() {
|
| +gfx::NativeView BlimpContentsViewImplAndroid::GetNativeView() {
|
| return view_.get();
|
| }
|
|
|
| -BlimpView* BlimpContentsViewAndroid::GetBlimpView() {
|
| +BlimpView* BlimpContentsViewImplAndroid::GetBlimpView() {
|
| return blimp_view_.get();
|
| }
|
|
|
| -ImeFeature::Delegate* BlimpContentsViewAndroid::GetImeDelegate() {
|
| +ImeFeature::Delegate* BlimpContentsViewImplAndroid::GetImeDelegate() {
|
| return ime_dialog_.get();
|
| }
|
|
|
|
|