| Index: blimp/client/core/contents/blimp_contents_impl.cc
|
| diff --git a/blimp/client/core/contents/blimp_contents_impl.cc b/blimp/client/core/contents/blimp_contents_impl.cc
|
| index 58dda849fe7c909ede2e565af5605e18712669a2..b1ebeb19c6d462721e897de198088d949d0d2a7e 100644
|
| --- a/blimp/client/core/contents/blimp_contents_impl.cc
|
| +++ b/blimp/client/core/contents/blimp_contents_impl.cc
|
| @@ -6,7 +6,6 @@
|
|
|
| #include "base/memory/ptr_util.h"
|
| #include "base/supports_user_data.h"
|
| -#include "blimp/client/core/contents/blimp_contents_view.h"
|
| #include "blimp/client/core/contents/tab_control_feature.h"
|
| #include "blimp/client/public/contents/blimp_contents_observer.h"
|
| #include "ui/gfx/native_widget_types.h"
|
| @@ -40,7 +39,7 @@ BlimpContentsImpl::BlimpContentsImpl(
|
| window_(window),
|
| tab_control_feature_(tab_control_feature) {
|
| blimp_contents_view_ =
|
| - BlimpContentsView::Create(this, compositor_manager_.layer());
|
| + BlimpContentsViewImpl::Create(this, compositor_manager_.layer());
|
| ime_feature_->set_delegate(blimp_contents_view_->GetImeDelegate());
|
| }
|
|
|
| @@ -84,8 +83,8 @@ void BlimpContentsImpl::RemoveObserver(BlimpContentsObserver* observer) {
|
| observers_.RemoveObserver(observer);
|
| }
|
|
|
| -gfx::NativeView BlimpContentsImpl::GetNativeView() {
|
| - return blimp_contents_view_->GetNativeView();
|
| +BlimpContentsViewImpl* BlimpContentsImpl::GetView() {
|
| + return blimp_contents_view_.get();
|
| }
|
|
|
| void BlimpContentsImpl::Show() {
|
| @@ -110,14 +109,15 @@ void BlimpContentsImpl::OnLoadingStateChanged(bool loading) {
|
| OnLoadingStateChanged(loading));
|
| }
|
|
|
| +void BlimpContentsImpl::OnPageLoadingStateChanged(bool loading) {
|
| + FOR_EACH_OBSERVER(BlimpContentsObserver, observers_,
|
| + OnPageLoadingStateChanged(loading));
|
| +}
|
| +
|
| void BlimpContentsImpl::SetSizeAndScale(const gfx::Size& size,
|
| float device_pixel_ratio) {
|
| tab_control_feature_->SetSizeAndScale(size, device_pixel_ratio);
|
| }
|
|
|
| -BlimpContentsView* BlimpContentsImpl::GetBlimpContentsView() {
|
| - return blimp_contents_view_.get();
|
| -}
|
| -
|
| } // namespace client
|
| } // namespace blimp
|
|
|