| Index: chrome/browser/android/tab_android.h
|
| diff --git a/chrome/browser/android/tab_android.h b/chrome/browser/android/tab_android.h
|
| index 182e79987522d4224209181bf26a43b5c114c544..ac8e397626766f4e10f3d4c66c24d588cd3b5f2f 100644
|
| --- a/chrome/browser/android/tab_android.h
|
| +++ b/chrome/browser/android/tab_android.h
|
| @@ -25,6 +25,10 @@ class GURL;
|
| class Profile;
|
| class SkBitmap;
|
|
|
| +namespace cc {
|
| +class Layer;
|
| +}
|
| +
|
| namespace chrome {
|
| struct NavigateParams;
|
| }
|
| @@ -32,6 +36,7 @@ struct NavigateParams;
|
| namespace chrome {
|
| namespace android {
|
| class ChromeWebContentsDelegateAndroid;
|
| +class TabContentManager;
|
| }
|
| }
|
|
|
| @@ -78,6 +83,9 @@ 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 cc::Layer that represents the content for this TabAndroid.
|
| + scoped_refptr<cc::Layer> GetContentLayer() const;
|
| +
|
| // Return specific id information regarding this TabAndroid.
|
| const SessionID& session_id() const { return session_tab_id_; }
|
| int GetAndroidId() const;
|
| @@ -186,6 +194,20 @@ class TabAndroid : public CoreTabHelperDelegate,
|
| jobject obj,
|
| jobject delegate);
|
|
|
| + // TODO(dtrainor): Remove this, pull content_layer() on demand.
|
| + void AttachToTabContentManager(JNIEnv* env,
|
| + jobject obj,
|
| + jobject jtab_content_manager);
|
| +
|
| + void AttachOverlayContentViewCore(JNIEnv* env,
|
| + jobject obj,
|
| + jobject jcontent_view_core,
|
| + jboolean visible);
|
| +
|
| + void DetachOverlayContentViewCore(JNIEnv* env,
|
| + jobject obj,
|
| + jobject jcontent_view_core);
|
| +
|
| // Register the Tab's native methods through JNI.
|
| static bool RegisterTabAndroid(JNIEnv* env);
|
|
|
| @@ -202,6 +224,9 @@ class TabAndroid : public CoreTabHelperDelegate,
|
|
|
| content::NotificationRegistrar notification_registrar_;
|
|
|
| + scoped_refptr<cc::Layer> content_layer_;
|
| + chrome::android::TabContentManager* tab_content_manager_;
|
| +
|
| scoped_ptr<content::WebContents> web_contents_;
|
| scoped_ptr<chrome::android::ChromeWebContentsDelegateAndroid>
|
| web_contents_delegate_;
|
|
|