| 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 ac1a2b6db85afeed62dc1a741e3078435c8bf066..bce55b7bbf06f8abe2270dbe42fb448487a6ba1a 100644
|
| --- a/blimp/client/core/contents/blimp_contents_impl.h
|
| +++ b/blimp/client/core/contents/blimp_contents_impl.h
|
| @@ -11,6 +11,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)
|
| @@ -35,7 +36,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,
|
| ImeFeature* ime_feature,
|
| NavigationFeature* navigation_feature,
|
| TabControlFeature* tab_control_feature);
|
| @@ -52,6 +55,9 @@ class BlimpContentsImpl : public BlimpContents,
|
| void RemoveObserver(BlimpContentsObserver* observer) override;
|
| gfx::NativeView GetNativeView() 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);
|
|
|
| @@ -64,6 +70,9 @@ class BlimpContentsImpl : public BlimpContents,
|
|
|
| int id() { return id_; }
|
|
|
| + // Returns the BlimpContentsView for this BlimpContentsImpl.
|
| + BlimpContentsView* GetBlimpContentsView();
|
| +
|
| private:
|
| // Handles the back/forward list and loading URLs.
|
| BlimpNavigationControllerImpl navigation_controller_;
|
| @@ -75,6 +84,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
|
|
|