[Android] Add support for a hung renderer dialog

chrome/browser/android/tab_android.h

Index: chrome/browser/android/tab_android.h
diff --git a/chrome/browser/android/tab_android.h b/chrome/browser/android/tab_android.h
index 2c74e4006e7f8758f8b69480ef784f75ea228b8f..dfe47cb45847315df497d5f969668d886cada30d 100644
--- a/chrome/browser/android/tab_android.h
+++ b/chrome/browser/android/tab_android.h
@@ -16,6 +16,7 @@
 #include "chrome/browser/ui/search/search_tab_helper_delegate.h"
 #include "chrome/browser/ui/tab_contents/core_tab_helper_delegate.h"
 #include "components/favicon/core/favicon_driver_observer.h"
+#include "components/infobars/core/infobar_manager.h"
 #include "components/sessions/session_id.h"
 #include "components/toolbar/toolbar_model.h"
 #include "content/public/browser/notification_observer.h"
@@ -45,6 +46,10 @@ class ContentViewCore;
 class WebContents;
 }
 
+namespace infobars {
+class InfoBar;
+}
+
 namespace prerender {
 class PrerenderManager;
 }
@@ -53,7 +58,8 @@ class TabAndroid : public CoreTabHelperDelegate,
                    public InstantServiceObserver,
                    public SearchTabHelperDelegate,
                    public content::NotificationObserver,
-                   public favicon::FaviconDriverObserver {
+                   public favicon::FaviconDriverObserver,
+                   public infobars::InfoBarManager::Observer {
  public:
   // A Java counterpart will be generated for this enum.
   // GENERATED_JAVA_ENUM_PACKAGE: org.chromium.chrome.browser
@@ -142,6 +148,9 @@ class TabAndroid : public CoreTabHelperDelegate,
   void OnFaviconUpdated(favicon::FaviconDriver* favicon_driver,
                         bool icon_url_changed) override;
 
+  // Overriden from infobars::InfoBarManager::Observer:

[gone, 2015/08/18 20:45:17]

nit: while you're here, could you make these observer comments consistent?

[jdduke (slow), 2015/08/21 21:18:31]

Done.

[jdduke (slow), 2015/08/21 21:18:31]

Done.

+  void OnInfoBarRemoved(infobars::InfoBar* infobar, bool animate) override;
+
   // Methods called from Java via JNI -----------------------------------------
 
   void Destroy(JNIEnv* env, jobject obj);
@@ -216,6 +225,9 @@ class TabAndroid : public CoreTabHelperDelegate,
 
   bool HasPrerenderedUrl(JNIEnv* env, jobject obj, jstring url);
 
+  void ShowHungRendererInfoBar(JNIEnv* env, jobject obj);
+  void DismissHungRendererInfoBar(JNIEnv* env, jobject obj);
+
   // Register the Tab's native methods through JNI.
   static bool RegisterTabAndroid(JNIEnv* env);
 
@@ -241,6 +253,10 @@ class TabAndroid : public CoreTabHelperDelegate,
 
   scoped_ptr<browser_sync::SyncedTabDelegateAndroid> synced_tab_delegate_;
 
+  // Transient InfoBar handle allowing dismissal of the hung renderer infobar

[gone, 2015/08/18 20:45:17]

nit: grammar is weird

[jdduke (slow), 2015/08/21 21:18:31]

Done.

+  // when the renderer regains responsivesness.
+  infobars::InfoBar* hung_renderer_infobar_;
+
   DISALLOW_COPY_AND_ASSIGN(TabAndroid);
 };