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

Unified Diff: chrome/browser/android/tab_android.h

Issue 908093003: Revert of Add support for ContentViewCore helpers on Tab (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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
« no previous file with comments | « chrome/browser/android/DEPS ('k') | chrome/browser/android/tab_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/android/tab_android.h
diff --git a/chrome/browser/android/tab_android.h b/chrome/browser/android/tab_android.h
index ac8e397626766f4e10f3d4c66c24d588cd3b5f2f..182e79987522d4224209181bf26a43b5c114c544 100644
--- a/chrome/browser/android/tab_android.h
+++ b/chrome/browser/android/tab_android.h
@@ -25,10 +25,6 @@
class Profile;
class SkBitmap;
-namespace cc {
-class Layer;
-}
-
namespace chrome {
struct NavigateParams;
}
@@ -36,7 +32,6 @@
namespace chrome {
namespace android {
class ChromeWebContentsDelegateAndroid;
-class TabContentManager;
}
}
@@ -82,9 +77,6 @@
// 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_; }
@@ -194,20 +186,6 @@
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);
@@ -223,9 +201,6 @@
SessionID session_window_id_;
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>
« no previous file with comments | « chrome/browser/android/DEPS ('k') | chrome/browser/android/tab_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698