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

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

Issue 1299513002: [Android] Add support for a hung renderer dialog (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 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 198 matching lines...) Expand 10 before | Expand all | Expand 10 after
209 jobject obj, 209 jobject obj,
210 jobject jcontent_view_core, 210 jobject jcontent_view_core,
211 jboolean visible); 211 jboolean visible);
212 212
213 void DetachOverlayContentViewCore(JNIEnv* env, 213 void DetachOverlayContentViewCore(JNIEnv* env,
214 jobject obj, 214 jobject obj,
215 jobject jcontent_view_core); 215 jobject jcontent_view_core);
216 216
217 bool HasPrerenderedUrl(JNIEnv* env, jobject obj, jstring url); 217 bool HasPrerenderedUrl(JNIEnv* env, jobject obj, jstring url);
218 218
219 void ShutdownHungRenderer(JNIEnv* env, jobject obj);
220
219 // Register the Tab's native methods through JNI. 221 // Register the Tab's native methods through JNI.
220 static bool RegisterTabAndroid(JNIEnv* env); 222 static bool RegisterTabAndroid(JNIEnv* env);
221 223
222 private: 224 private:
223 prerender::PrerenderManager* GetPrerenderManager() const; 225 prerender::PrerenderManager* GetPrerenderManager() const;
224 226
225 JavaObjectWeakGlobalRef weak_java_tab_; 227 JavaObjectWeakGlobalRef weak_java_tab_;
226 228
227 // The identifier used by session restore for this tab. 229 // The identifier used by session restore for this tab.
228 SessionID session_tab_id_; 230 SessionID session_tab_id_;
229 231
230 // Identifier of the window the tab is in. 232 // Identifier of the window the tab is in.
231 SessionID session_window_id_; 233 SessionID session_window_id_;
232 234
233 content::NotificationRegistrar notification_registrar_; 235 content::NotificationRegistrar notification_registrar_;
234 236
235 scoped_refptr<cc::Layer> content_layer_; 237 scoped_refptr<cc::Layer> content_layer_;
236 chrome::android::TabContentManager* tab_content_manager_; 238 chrome::android::TabContentManager* tab_content_manager_;
237 239
238 scoped_ptr<content::WebContents> web_contents_; 240 scoped_ptr<content::WebContents> web_contents_;
239 scoped_ptr<chrome::android::ChromeWebContentsDelegateAndroid> 241 scoped_ptr<chrome::android::ChromeWebContentsDelegateAndroid>
240 web_contents_delegate_; 242 web_contents_delegate_;
241 243
242 scoped_ptr<browser_sync::SyncedTabDelegateAndroid> synced_tab_delegate_; 244 scoped_ptr<browser_sync::SyncedTabDelegateAndroid> synced_tab_delegate_;
243 245
244 DISALLOW_COPY_AND_ASSIGN(TabAndroid); 246 DISALLOW_COPY_AND_ASSIGN(TabAndroid);
245 }; 247 };
246 248
247 #endif // CHROME_BROWSER_ANDROID_TAB_ANDROID_H_ 249 #endif // CHROME_BROWSER_ANDROID_TAB_ANDROID_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698