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

Unified Diff: blimp/client/core/contents/blimp_contents_impl.cc

Issue 2320923002: Add a full Blimp integration test. (Closed)
Patch Set: Fix build break with chrome embedder 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 side-by-side diff with in-line comments
Download patch
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 71019de418d8643fb7f37f271167b53d2dcfa461..5777e1b77afab65f8cc0cbecf8f5d7aea32d9780 100644
--- a/blimp/client/core/contents/blimp_contents_impl.cc
+++ b/blimp/client/core/contents/blimp_contents_impl.cc
@@ -7,7 +7,6 @@
#include "base/memory/ptr_util.h"
#include "base/metrics/histogram_macros.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"
@@ -41,7 +40,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());
}
@@ -85,8 +84,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() {
@@ -113,14 +112,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
« no previous file with comments | « blimp/client/core/contents/blimp_contents_impl.h ('k') | blimp/client/core/contents/blimp_contents_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698