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

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

Issue 2270323004: Add BlimpView to a Chrome tab when Blimp is enabled. (Closed)
Patch Set: Now owned by BlimpContentsViewAndroid and also implemented touch and sizing Created 4 years, 4 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 76e486f0a68630842444918a99ba2c8c6e801329..2b90ba4d3e408a9054abccf887060d9ec8f04995 100644
--- a/blimp/client/core/contents/blimp_contents_impl.cc
+++ b/blimp/client/core/contents/blimp_contents_impl.cc
@@ -9,6 +9,7 @@
#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"
#if defined(OS_ANDROID)
#include "blimp/client/core/contents/android/blimp_contents_impl_android.h"
@@ -25,11 +26,13 @@ const char kBlimpContentsImplAndroidKey[] = "blimp_contents_impl_android";
}
BlimpContentsImpl::BlimpContentsImpl(int id,
+ gfx::NativeWindow window,
ImeFeature* ime_feature,
NavigationFeature* navigation_feature,
TabControlFeature* tab_control_feature)
: navigation_controller_(this, navigation_feature),
id_(id),
+ window_(window),
tab_control_feature_(tab_control_feature) {
blimp_contents_view_ = BlimpContentsView::Create(this);
}
@@ -61,6 +64,10 @@ BlimpNavigationControllerImpl& BlimpContentsImpl::GetNavigationController() {
return navigation_controller_;
}
+gfx::NativeWindow BlimpContentsImpl::GetNativeWindow() {
+ return window_;
+}
+
void BlimpContentsImpl::AddObserver(BlimpContentsObserver* observer) {
observers_.AddObserver(observer);
}
@@ -87,5 +94,9 @@ void BlimpContentsImpl::SetSizeAndScale(const gfx::Size& size,
tab_control_feature_->SetSizeAndScale(size, device_pixel_ratio);
}
+BlimpContentsView* BlimpContentsImpl::GetBlimpContentsView() {
+ return blimp_contents_view_.get();
+}
+
} // namespace client
} // namespace blimp

Powered by Google App Engine
This is Rietveld 408576698