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

Side by Side Diff: chrome/browser/android/tab_android.h

Issue 949443002: Upstream ChromeTab.hasPrerenderedUrl to 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 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 9
10 #include "base/android/jni_weak_ref.h" 10 #include "base/android/jni_weak_ref.h"
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after
204 204
205 void AttachOverlayContentViewCore(JNIEnv* env, 205 void AttachOverlayContentViewCore(JNIEnv* env,
206 jobject obj, 206 jobject obj,
207 jobject jcontent_view_core, 207 jobject jcontent_view_core,
208 jboolean visible); 208 jboolean visible);
209 209
210 void DetachOverlayContentViewCore(JNIEnv* env, 210 void DetachOverlayContentViewCore(JNIEnv* env,
211 jobject obj, 211 jobject obj,
212 jobject jcontent_view_core); 212 jobject jcontent_view_core);
213 213
214 bool HasPrerenderedUrl(JNIEnv* env, jobject obj, jstring url);
215
214 // Register the Tab's native methods through JNI. 216 // Register the Tab's native methods through JNI.
215 static bool RegisterTabAndroid(JNIEnv* env); 217 static bool RegisterTabAndroid(JNIEnv* env);
216 218
217 private: 219 private:
218 prerender::PrerenderManager* GetPrerenderManager() const; 220 prerender::PrerenderManager* GetPrerenderManager() const;
219 221
220 JavaObjectWeakGlobalRef weak_java_tab_; 222 JavaObjectWeakGlobalRef weak_java_tab_;
221 223
222 // The identifier used by session restore for this tab. 224 // The identifier used by session restore for this tab.
223 SessionID session_tab_id_; 225 SessionID session_tab_id_;
224 226
225 // Identifier of the window the tab is in. 227 // Identifier of the window the tab is in.
226 SessionID session_window_id_; 228 SessionID session_window_id_;
227 229
228 content::NotificationRegistrar notification_registrar_; 230 content::NotificationRegistrar notification_registrar_;
229 231
230 scoped_refptr<cc::Layer> content_layer_; 232 scoped_refptr<cc::Layer> content_layer_;
231 chrome::android::TabContentManager* tab_content_manager_; 233 chrome::android::TabContentManager* tab_content_manager_;
232 234
233 scoped_ptr<content::WebContents> web_contents_; 235 scoped_ptr<content::WebContents> web_contents_;
234 scoped_ptr<chrome::android::ChromeWebContentsDelegateAndroid> 236 scoped_ptr<chrome::android::ChromeWebContentsDelegateAndroid>
235 web_contents_delegate_; 237 web_contents_delegate_;
236 238
237 scoped_ptr<browser_sync::SyncedTabDelegateAndroid> synced_tab_delegate_; 239 scoped_ptr<browser_sync::SyncedTabDelegateAndroid> synced_tab_delegate_;
238 240
239 DISALLOW_COPY_AND_ASSIGN(TabAndroid); 241 DISALLOW_COPY_AND_ASSIGN(TabAndroid);
240 }; 242 };
241 243
242 #endif // CHROME_BROWSER_ANDROID_TAB_ANDROID_H_ 244 #endif // CHROME_BROWSER_ANDROID_TAB_ANDROID_H_
OLDNEW
« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/Tab.java ('k') | chrome/browser/android/tab_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698