[Android] Add support for a hung renderer dialog

chrome/browser/android/tab_android.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_ANDROID_TAB_ANDROID_H_
 #define CHROME_BROWSER_ANDROID_TAB_ANDROID_H_
 
 #include <jni.h>
 
 #include "base/android/jni_weak_ref.h"
 #include "base/callback_forward.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
 #include "chrome/browser/search/instant_service_observer.h"
 #include "chrome/browser/sync/glue/synced_tab_delegate_android.h"
 #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"
 #include "content/public/browser/notification_registrar.h"
 
 class GURL;
 class Profile;
 class SkBitmap;
 
 namespace cc {
 class Layer;
 }
 
 namespace chrome {
 struct NavigateParams;
 }
 
 namespace chrome {
 namespace android {
 class ChromeWebContentsDelegateAndroid;
 class TabContentManager;
 }
 }
 
 namespace content {
 class ContentViewCore;
 class WebContents;
 }
 
+namespace infobars {
+class InfoBar;
+}
+
 namespace prerender {
 class PrerenderManager;
 }
 
 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
   enum TabLoadStatus {
     PAGE_LOAD_FAILED = 0,
     DEFAULT_PAGE_LOAD = 1,
     PARTIAL_PRERENDERED_PAGE_LOAD = 2,
     FULL_PRERENDERED_PAGE_LOAD = 3,
   };
 
@@ skipping 68 matching lines @@
   // NotificationObserver -----------------------------------------------------
   void Observe(int type,
                const content::NotificationSource& source,
                const content::NotificationDetails& details) override;
 
   // favicon::FaviconDriverObserver -------------------------------------------
   void OnFaviconAvailable(const gfx::Image& image) override;
   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);
   void InitWebContents(JNIEnv* env,
                        jobject obj,
                        jboolean incognito,
                        jobject jcontent_view_core,
                        jobject jweb_contents_delegate,
                        jobject jcontext_menu_populator);
   void DestroyWebContents(JNIEnv* env, jobject obj, jboolean delete_native);
@@ skipping 54 matching lines @@
                                     jobject obj,
                                     jobject jcontent_view_core,
                                     jboolean visible);
 
   void DetachOverlayContentViewCore(JNIEnv* env,
                                     jobject obj,
                                     jobject jcontent_view_core);
 
   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);
 
  private:
   prerender::PrerenderManager* GetPrerenderManager() const;
 
   JavaObjectWeakGlobalRef weak_java_tab_;
 
   // The identifier used by session restore for this tab.
   SessionID session_tab_id_;
 
   // Identifier of the window the tab is in.
   SessionID session_window_id_;
 
   content::NotificationRegistrar notification_registrar_;
 
   scoped_refptr<cc::Layer> content_layer_;
   chrome::android::TabContentManager* tab_content_manager_;
 
   scoped_ptr<content::WebContents> web_contents_;
   scoped_ptr<chrome::android::ChromeWebContentsDelegateAndroid>
       web_contents_delegate_;
 
   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);
 };
 
 #endif  // CHROME_BROWSER_ANDROID_TAB_ANDROID_H_