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

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: Rebase Created 5 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
« no previous file with comments | « chrome/browser/android/resource_id.h ('k') | chrome/browser/android/tab_android.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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"
11 #include "base/callback_forward.h" 11 #include "base/callback_forward.h"
12 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
13 #include "base/strings/string16.h" 13 #include "base/strings/string16.h"
14 #include "chrome/browser/search/instant_service_observer.h" 14 #include "chrome/browser/search/instant_service_observer.h"
15 #include "chrome/browser/sync/glue/synced_tab_delegate_android.h" 15 #include "chrome/browser/sync/glue/synced_tab_delegate_android.h"
16 #include "chrome/browser/ui/search/search_tab_helper_delegate.h" 16 #include "chrome/browser/ui/search/search_tab_helper_delegate.h"
17 #include "chrome/browser/ui/tab_contents/core_tab_helper_delegate.h" 17 #include "chrome/browser/ui/tab_contents/core_tab_helper_delegate.h"
18 #include "components/favicon/core/favicon_driver_observer.h" 18 #include "components/favicon/core/favicon_driver_observer.h"
19 #include "components/infobars/core/infobar_manager.h"
19 #include "components/sessions/session_id.h" 20 #include "components/sessions/session_id.h"
20 #include "components/toolbar/toolbar_model.h" 21 #include "components/toolbar/toolbar_model.h"
21 #include "content/public/browser/notification_observer.h" 22 #include "content/public/browser/notification_observer.h"
22 #include "content/public/browser/notification_registrar.h" 23 #include "content/public/browser/notification_registrar.h"
23 24
24 class GURL; 25 class GURL;
25 class Profile; 26 class Profile;
26 class SkBitmap; 27 class SkBitmap;
27 28
28 namespace cc { 29 namespace cc {
29 class Layer; 30 class Layer;
30 } 31 }
31 32
32 namespace chrome { 33 namespace chrome {
33 struct NavigateParams; 34 struct NavigateParams;
34 } 35 }
35 36
36 namespace chrome { 37 namespace chrome {
37 namespace android { 38 namespace android {
38 class ChromeWebContentsDelegateAndroid; 39 class ChromeWebContentsDelegateAndroid;
39 class TabContentManager; 40 class TabContentManager;
40 } 41 }
41 } 42 }
42 43
43 namespace content { 44 namespace content {
44 class ContentViewCore; 45 class ContentViewCore;
45 class WebContents; 46 class WebContents;
46 } 47 }
47 48
49 namespace infobars {
50 class InfoBar;
51 }
52
48 namespace offline_pages { 53 namespace offline_pages {
49 struct OfflinePageItem; 54 struct OfflinePageItem;
50 } 55 }
51 56
52 namespace prerender { 57 namespace prerender {
53 class PrerenderManager; 58 class PrerenderManager;
54 } 59 }
55 60
56 class TabAndroid : public CoreTabHelperDelegate, 61 class TabAndroid : public CoreTabHelperDelegate,
57 public InstantServiceObserver, 62 public InstantServiceObserver,
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 Profile* GetProfile() const; 115 Profile* GetProfile() const;
111 browser_sync::SyncedTabDelegate* GetSyncedTabDelegate() const; 116 browser_sync::SyncedTabDelegate* GetSyncedTabDelegate() const;
112 117
113 void SetWindowSessionID(SessionID::id_type window_id); 118 void SetWindowSessionID(SessionID::id_type window_id);
114 void SetSyncId(int sync_id); 119 void SetSyncId(int sync_id);
115 120
116 void HandlePopupNavigation(chrome::NavigateParams* params); 121 void HandlePopupNavigation(chrome::NavigateParams* params);
117 122
118 bool HasPrerenderedUrl(GURL gurl); 123 bool HasPrerenderedUrl(GURL gurl);
119 124
125 void OnRendererUnresponsive(JNIEnv* env, jobject obj);
126 void OnRendererResponsive(JNIEnv* env, jobject obj);
127
120 void MakeLoadURLParams( 128 void MakeLoadURLParams(
121 chrome::NavigateParams* params, 129 chrome::NavigateParams* params,
122 content::NavigationController::LoadURLParams* load_url_params); 130 content::NavigationController::LoadURLParams* load_url_params);
123 131
124 // CoreTabHelperDelegate ---------------------------------------------------- 132 // Overridden from CoreTabHelperDelegate:
125
126 void SwapTabContents(content::WebContents* old_contents, 133 void SwapTabContents(content::WebContents* old_contents,
127 content::WebContents* new_contents, 134 content::WebContents* new_contents,
128 bool did_start_load, 135 bool did_start_load,
129 bool did_finish_load) override; 136 bool did_finish_load) override;
130 137
131 // Overridden from InstantServiceObserver: 138 // Overridden from InstantServiceObserver:
132 void DefaultSearchProviderChanged( 139 void DefaultSearchProviderChanged(
133 bool google_base_url_domain_changed) override; 140 bool google_base_url_domain_changed) override;
134 141
135 // Overridden from SearchTabHelperDelegate: 142 // Overridden from SearchTabHelperDelegate:
136 void OnWebContentsInstantSupportDisabled( 143 void OnWebContentsInstantSupportDisabled(
137 const content::WebContents* web_contents) override; 144 const content::WebContents* web_contents) override;
138 145
139 // NotificationObserver ----------------------------------------------------- 146 // Overridden from NotificationObserver:
140 void Observe(int type, 147 void Observe(int type,
141 const content::NotificationSource& source, 148 const content::NotificationSource& source,
142 const content::NotificationDetails& details) override; 149 const content::NotificationDetails& details) override;
143 150
144 // favicon::FaviconDriverObserver ------------------------------------------- 151 // Overridden from favicon::FaviconDriverObserver:
145 void OnFaviconAvailable(const gfx::Image& image) override; 152 void OnFaviconAvailable(const gfx::Image& image) override;
146 void OnFaviconUpdated(favicon::FaviconDriver* favicon_driver, 153 void OnFaviconUpdated(favicon::FaviconDriver* favicon_driver,
147 bool icon_url_changed) override; 154 bool icon_url_changed) override;
148 155
149 // Methods called from Java via JNI ----------------------------------------- 156 // Methods called from Java via JNI -----------------------------------------
150 157
151 void Destroy(JNIEnv* env, jobject obj); 158 void Destroy(JNIEnv* env, jobject obj);
152 void InitWebContents(JNIEnv* env, 159 void InitWebContents(JNIEnv* env,
153 jobject obj, 160 jobject obj,
154 jboolean incognito, 161 jboolean incognito,
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
251 scoped_ptr<content::WebContents> web_contents_; 258 scoped_ptr<content::WebContents> web_contents_;
252 scoped_ptr<chrome::android::ChromeWebContentsDelegateAndroid> 259 scoped_ptr<chrome::android::ChromeWebContentsDelegateAndroid>
253 web_contents_delegate_; 260 web_contents_delegate_;
254 261
255 scoped_ptr<browser_sync::SyncedTabDelegateAndroid> synced_tab_delegate_; 262 scoped_ptr<browser_sync::SyncedTabDelegateAndroid> synced_tab_delegate_;
256 263
257 DISALLOW_COPY_AND_ASSIGN(TabAndroid); 264 DISALLOW_COPY_AND_ASSIGN(TabAndroid);
258 }; 265 };
259 266
260 #endif // CHROME_BROWSER_ANDROID_TAB_ANDROID_H_ 267 #endif // CHROME_BROWSER_ANDROID_TAB_ANDROID_H_
OLDNEW
« no previous file with comments | « chrome/browser/android/resource_id.h ('k') | chrome/browser/android/tab_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698