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

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

Issue 2233023002: Adding BlimpNavigationController to Tab (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@nav_handler_remove
Patch Set: initial comments 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: 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);

Powered by Google App Engine
This is Rietveld 408576698