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

Side by Side 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: Fixing unit tests Created 4 years, 3 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_ANDROID_TAB_ANDROID_H_ 5 #ifndef CHROME_BROWSER_ANDROID_TAB_ANDROID_H_
6 #define CHROME_BROWSER_ANDROID_TAB_ANDROID_H_ 6 #define CHROME_BROWSER_ANDROID_TAB_ANDROID_H_
7 7
8 #include <jni.h> 8 #include <jni.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
(...skipping 11 matching lines...) Expand all
22 #include "components/infobars/core/infobar_manager.h" 22 #include "components/infobars/core/infobar_manager.h"
23 #include "components/sessions/core/session_id.h" 23 #include "components/sessions/core/session_id.h"
24 #include "components/toolbar/toolbar_model.h" 24 #include "components/toolbar/toolbar_model.h"
25 #include "content/public/browser/notification_observer.h" 25 #include "content/public/browser/notification_observer.h"
26 #include "content/public/browser/notification_registrar.h" 26 #include "content/public/browser/notification_registrar.h"
27 27
28 class GURL; 28 class GURL;
29 class Profile; 29 class Profile;
30 class SkBitmap; 30 class SkBitmap;
31 31
32 namespace blimp {
33 namespace client {
34 class BlimpContents;
35 }
36 }
37
32 namespace cc { 38 namespace cc {
33 class Layer; 39 class Layer;
34 } 40 }
35 41
36 namespace chrome { 42 namespace chrome {
37 struct NavigateParams; 43 struct NavigateParams;
38 } 44 }
39 45
40 namespace chrome { 46 namespace chrome {
41 namespace android { 47 namespace android {
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 static void AttachTabHelpers(content::WebContents* web_contents); 89 static void AttachTabHelpers(content::WebContents* web_contents);
84 90
85 TabAndroid(JNIEnv* env, jobject obj); 91 TabAndroid(JNIEnv* env, jobject obj);
86 ~TabAndroid() override; 92 ~TabAndroid() override;
87 93
88 base::android::ScopedJavaLocalRef<jobject> GetJavaObject(); 94 base::android::ScopedJavaLocalRef<jobject> GetJavaObject();
89 95
90 // Return the WebContents, if any, currently owned by this TabAndroid. 96 // Return the WebContents, if any, currently owned by this TabAndroid.
91 content::WebContents* web_contents() const { return web_contents_.get(); } 97 content::WebContents* web_contents() const { return web_contents_.get(); }
92 98
99 // Return the BlimpContents, if any, currently owned by this TabAndroid.
100 blimp::client::BlimpContents* blimp_contents() const {
101 return blimp_contents_.get();
102 }
103
93 // Return the cc::Layer that represents the content for this TabAndroid. 104 // Return the cc::Layer that represents the content for this TabAndroid.
94 scoped_refptr<cc::Layer> GetContentLayer() const; 105 scoped_refptr<cc::Layer> GetContentLayer() const;
95 106
96 // Return specific id information regarding this TabAndroid. 107 // Return specific id information regarding this TabAndroid.
97 const SessionID& session_id() const { return session_tab_id_; } 108 const SessionID& session_id() const { return session_tab_id_; }
98 const SessionID& window_id() const { return session_window_id_; } 109 const SessionID& window_id() const { return session_window_id_; }
99 110
100 int GetAndroidId() const; 111 int GetAndroidId() const;
101 int GetSyncId() const; 112 int GetSyncId() const;
102 113
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 // Methods called from Java via JNI ----------------------------------------- 169 // Methods called from Java via JNI -----------------------------------------
159 170
160 void Destroy(JNIEnv* env, const base::android::JavaParamRef<jobject>& obj); 171 void Destroy(JNIEnv* env, const base::android::JavaParamRef<jobject>& obj);
161 void InitWebContents( 172 void InitWebContents(
162 JNIEnv* env, 173 JNIEnv* env,
163 const base::android::JavaParamRef<jobject>& obj, 174 const base::android::JavaParamRef<jobject>& obj,
164 jboolean incognito, 175 jboolean incognito,
165 const base::android::JavaParamRef<jobject>& jweb_contents, 176 const base::android::JavaParamRef<jobject>& jweb_contents,
166 const base::android::JavaParamRef<jobject>& jweb_contents_delegate, 177 const base::android::JavaParamRef<jobject>& jweb_contents_delegate,
167 const base::android::JavaParamRef<jobject>& jcontext_menu_populator); 178 const base::android::JavaParamRef<jobject>& jcontext_menu_populator);
179 base::android::ScopedJavaLocalRef<jobject> InitBlimpContents(
180 JNIEnv* env,
181 const base::android::JavaParamRef<jobject>& obj,
182 const base::android::JavaParamRef<jobject>& j_profile);
168 void UpdateDelegates( 183 void UpdateDelegates(
169 JNIEnv* env, 184 JNIEnv* env,
170 const base::android::JavaParamRef<jobject>& obj, 185 const base::android::JavaParamRef<jobject>& obj,
171 const base::android::JavaParamRef<jobject>& jweb_contents_delegate, 186 const base::android::JavaParamRef<jobject>& jweb_contents_delegate,
172 const base::android::JavaParamRef<jobject>& jcontext_menu_populator); 187 const base::android::JavaParamRef<jobject>& jcontext_menu_populator);
173 void DestroyWebContents(JNIEnv* env, 188 void DestroyWebContents(JNIEnv* env,
174 const base::android::JavaParamRef<jobject>& obj, 189 const base::android::JavaParamRef<jobject>& obj,
175 jboolean delete_native); 190 jboolean delete_native);
176 base::android::ScopedJavaLocalRef<jobject> GetProfileAndroid( 191 base::android::ScopedJavaLocalRef<jobject> GetProfileAndroid(
177 JNIEnv* env, 192 JNIEnv* env,
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
276 291
277 content::NotificationRegistrar notification_registrar_; 292 content::NotificationRegistrar notification_registrar_;
278 293
279 scoped_refptr<cc::Layer> content_layer_; 294 scoped_refptr<cc::Layer> content_layer_;
280 chrome::android::TabContentManager* tab_content_manager_; 295 chrome::android::TabContentManager* tab_content_manager_;
281 296
282 std::unique_ptr<content::WebContents> web_contents_; 297 std::unique_ptr<content::WebContents> web_contents_;
283 std::unique_ptr<chrome::android::TabWebContentsDelegateAndroid> 298 std::unique_ptr<chrome::android::TabWebContentsDelegateAndroid>
284 web_contents_delegate_; 299 web_contents_delegate_;
285 300
301 std::unique_ptr<blimp::client::BlimpContents> blimp_contents_;
302
286 std::unique_ptr<browser_sync::SyncedTabDelegateAndroid> synced_tab_delegate_; 303 std::unique_ptr<browser_sync::SyncedTabDelegateAndroid> synced_tab_delegate_;
287 304
288 DISALLOW_COPY_AND_ASSIGN(TabAndroid); 305 DISALLOW_COPY_AND_ASSIGN(TabAndroid);
289 }; 306 };
290 307
291 #endif // CHROME_BROWSER_ANDROID_TAB_ANDROID_H_ 308 #endif // CHROME_BROWSER_ANDROID_TAB_ANDROID_H_
OLDNEW
« no previous file with comments | « chrome/browser/android/blimp/blimp_client_context_factory.cc ('k') | chrome/browser/android/tab_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698