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

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

Issue 2270323004: Add BlimpView to a Chrome tab when Blimp is enabled. (Closed)
Patch Set: addressed nit, renamed CreateForTesting and piped through touch handling 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.h
diff --git a/blimp/client/core/contents/blimp_contents_impl.h b/blimp/client/core/contents/blimp_contents_impl.h
index 76b96deaaa637fd59797409c3f3397429a53dcf3..cee07bb597c57906d03adec830e28781e10663ad 100644
--- a/blimp/client/core/contents/blimp_contents_impl.h
+++ b/blimp/client/core/contents/blimp_contents_impl.h
@@ -12,6 +12,7 @@
#include "blimp/client/core/contents/blimp_navigation_controller_impl.h"
#include "blimp/client/public/contents/blimp_contents.h"
#include "ui/gfx/geometry/size.h"
+#include "ui/gfx/native_widget_types.h"
#include "url/gurl.h"
#if defined(OS_ANDROID)
@@ -38,7 +39,9 @@ class BlimpContentsImpl : public BlimpContents,
public BlimpNavigationControllerDelegate {
public:
// Ownership of the features remains with the caller.
+ // |window| must be the platform specific window that this will be shown in.
explicit BlimpContentsImpl(int id,
+ gfx::NativeWindow window,
BlimpCompositorDependencies* compositor_deps,
ImeFeature* ime_feature,
NavigationFeature* navigation_feature,
@@ -59,6 +62,9 @@ class BlimpContentsImpl : public BlimpContents,
void Show() override;
void Hide() override;
+ // Returns the platform specific window that this BlimpContents is showed in.
+ gfx::NativeWindow GetNativeWindow();
+
// Check if some observer is in the observer list.
bool HasObserver(BlimpContentsObserver* observer);
@@ -71,6 +77,12 @@ class BlimpContentsImpl : public BlimpContents,
int id() { return id_; }
+ // Returns the BlimpContentsView for this BlimpContentsImpl.
+ BlimpContentsView* GetBlimpContentsView();
+
+ // TODO(nyquist): Remove this once the Android BlimpView uses a delegate.
+ BlimpCompositorManager* compositor_manager() { return &compositor_manager_; }
+
private:
// Handles the back/forward list and loading URLs.
BlimpNavigationControllerImpl navigation_controller_;
@@ -87,6 +99,9 @@ class BlimpContentsImpl : public BlimpContents,
// BlimpContentsManager to control the life time of the its observer.
int id_;
+ // The platform specific window that this BlimpContents is showed in.
+ gfx::NativeWindow window_;
+
// The tab control feature through which the BlimpContentsImpl is able to
// set size and scale.
// TODO(mlliu): in the long term, we want to put size and scale in a different

Powered by Google App Engine
This is Rietveld 408576698