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

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

Issue 774183004: Upstream historical tab logic (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@upstreaming_2
Patch Set: Created 6 years 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 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 jboolean is_renderer_initiated); 156 jboolean is_renderer_initiated);
157 void SetActiveNavigationEntryTitleForUrl(JNIEnv* env, 157 void SetActiveNavigationEntryTitleForUrl(JNIEnv* env,
158 jobject obj, 158 jobject obj,
159 jstring jurl, 159 jstring jurl,
160 jstring jtitle); 160 jstring jtitle);
161 bool Print(JNIEnv* env, jobject obj); 161 bool Print(JNIEnv* env, jobject obj);
162 // Called to get default favicon of current tab, return null if no 162 // Called to get default favicon of current tab, return null if no
163 // favicon is avaliable for current tab. 163 // favicon is avaliable for current tab.
164 base::android::ScopedJavaLocalRef<jobject> GetDefaultFavicon(JNIEnv* env, 164 base::android::ScopedJavaLocalRef<jobject> GetDefaultFavicon(JNIEnv* env,
165 jobject obj); 165 jobject obj);
166
167 void CreateHistoricalTab(JNIEnv* env, jobject obj);
168
169 static void CreateHistoricalTabFromContents(
170 content::WebContents* web_contents);
171
166 // Register the Tab's native methods through JNI. 172 // Register the Tab's native methods through JNI.
167 static bool RegisterTabAndroid(JNIEnv* env); 173 static bool RegisterTabAndroid(JNIEnv* env);
168 174
169 private: 175 private:
170 prerender::PrerenderManager* GetPrerenderManager() const; 176 prerender::PrerenderManager* GetPrerenderManager() const;
171 177
172 JavaObjectWeakGlobalRef weak_java_tab_; 178 JavaObjectWeakGlobalRef weak_java_tab_;
173 179
174 // The identifier used by session restore for this tab. 180 // The identifier used by session restore for this tab.
175 SessionID session_tab_id_; 181 SessionID session_tab_id_;
176 182
177 // Identifier of the window the tab is in. 183 // Identifier of the window the tab is in.
178 SessionID session_window_id_; 184 SessionID session_window_id_;
179 185
180 content::NotificationRegistrar notification_registrar_; 186 content::NotificationRegistrar notification_registrar_;
181 187
182 scoped_ptr<content::WebContents> web_contents_; 188 scoped_ptr<content::WebContents> web_contents_;
183 scoped_ptr<chrome::android::ChromeWebContentsDelegateAndroid> 189 scoped_ptr<chrome::android::ChromeWebContentsDelegateAndroid>
184 web_contents_delegate_; 190 web_contents_delegate_;
185 191
186 scoped_ptr<browser_sync::SyncedTabDelegateAndroid> synced_tab_delegate_; 192 scoped_ptr<browser_sync::SyncedTabDelegateAndroid> synced_tab_delegate_;
187 193
188 DISALLOW_COPY_AND_ASSIGN(TabAndroid); 194 DISALLOW_COPY_AND_ASSIGN(TabAndroid);
189 }; 195 };
190 196
191 #endif // CHROME_BROWSER_ANDROID_TAB_ANDROID_H_ 197 #endif // CHROME_BROWSER_ANDROID_TAB_ANDROID_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698