| Index: chrome/browser/android/tab_android.h
|
| diff --git a/chrome/browser/android/tab_android.h b/chrome/browser/android/tab_android.h
|
| index 9094abfcc48010b468b0eb6e290b3a5c564af832..fb2b35628e049e18c45174308d0b6192ff2ac3bf 100644
|
| --- a/chrome/browser/android/tab_android.h
|
| +++ b/chrome/browser/android/tab_android.h
|
| @@ -29,6 +29,12 @@ class GURL;
|
| class Profile;
|
| class SkBitmap;
|
|
|
| +namespace blimp {
|
| +namespace client {
|
| +class BlimpContents;
|
| +}
|
| +}
|
| +
|
| namespace cc {
|
| class Layer;
|
| }
|
| @@ -90,6 +96,11 @@ class TabAndroid : public CoreTabHelperDelegate,
|
| // Return the WebContents, if any, currently owned by this TabAndroid.
|
| content::WebContents* web_contents() const { return web_contents_.get(); }
|
|
|
| + // Return the BlimpContents, if any, currently owned by this TabAndroid.
|
| + blimp::client::BlimpContents* blimp_contents() const {
|
| + return blimp_contents_.get();
|
| + }
|
| +
|
| // Return the cc::Layer that represents the content for this TabAndroid.
|
| scoped_refptr<cc::Layer> GetContentLayer() const;
|
|
|
| @@ -165,6 +176,11 @@ class TabAndroid : public CoreTabHelperDelegate,
|
| const base::android::JavaParamRef<jobject>& jweb_contents,
|
| const base::android::JavaParamRef<jobject>& jweb_contents_delegate,
|
| const base::android::JavaParamRef<jobject>& jcontext_menu_populator);
|
| + void InitBlimpContents(JNIEnv* env,
|
| + const base::android::JavaParamRef<jobject>& obj);
|
| + base::android::ScopedJavaLocalRef<jobject> GetBlimpContents(
|
| + JNIEnv* env,
|
| + const base::android::JavaParamRef<jobject>& obj);
|
| void UpdateDelegates(
|
| JNIEnv* env,
|
| const base::android::JavaParamRef<jobject>& obj,
|
| @@ -283,6 +299,8 @@ class TabAndroid : public CoreTabHelperDelegate,
|
| std::unique_ptr<chrome::android::TabWebContentsDelegateAndroid>
|
| web_contents_delegate_;
|
|
|
| + std::unique_ptr<blimp::client::BlimpContents> blimp_contents_;
|
| +
|
| std::unique_ptr<browser_sync::SyncedTabDelegateAndroid> synced_tab_delegate_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(TabAndroid);
|
|
|