[Android] Add support for a hung renderer dialog

chrome/browser/android/tab_android.cc

 // 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.
 
 #include "chrome/browser/android/tab_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/metrics/histogram.h"
 #include "base/trace_event/trace_event.h"
 #include "cc/layers/layer.h"
 #include "chrome/browser/android/chrome_web_contents_delegate_android.h"
 #include "chrome/browser/android/compositor/tab_content_manager.h"
+#include "chrome/browser/android/hung_renderer_infobar_delegate.h"
 #include "chrome/browser/android/metrics/uma_utils.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/bookmarks/managed_bookmark_service_factory.h"
 #include "chrome/browser/browser_about_handler.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/prerender/prerender_contents.h"
 #include "chrome/browser/prerender/prerender_manager.h"
 #include "chrome/browser/prerender/prerender_manager_factory.h"
@@ skipping 21 matching lines @@
 #include "chrome/browser/ui/tab_helpers.h"
 #include "chrome/common/instant_types.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
 #include "components/bookmarks/browser/bookmark_model.h"
 #include "components/bookmarks/browser/bookmark_node.h"
 #include "components/bookmarks/browser/bookmark_utils.h"
 #include "components/bookmarks/managed/managed_bookmark_service.h"
 #include "components/dom_distiller/core/url_utils.h"
 #include "components/favicon/content/content_favicon_driver.h"
+#include "components/infobars/core/infobar.h"
 #include "components/infobars/core/infobar_container.h"
 #include "components/navigation_interception/intercept_navigation_delegate.h"
 #include "components/navigation_interception/navigation_params.h"
 #include "components/url_formatter/url_fixer.h"
 #include "content/public/browser/android/compositor.h"
 #include "content/public/browser/android/content_view_core.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/interstitial_page.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_service.h"
@@ skipping 51 matching lines @@
 void TabAndroid::AttachTabHelpers(content::WebContents* web_contents) {
   DCHECK(web_contents);
 
   TabHelpers::AttachTabHelpers(web_contents);
 }
 
 TabAndroid::TabAndroid(JNIEnv* env, jobject obj)
     : weak_java_tab_(env, obj),
       content_layer_(cc::Layer::Create(content::Compositor::LayerSettings())),
       tab_content_manager_(NULL),
-      synced_tab_delegate_(new browser_sync::SyncedTabDelegateAndroid(this)) {
+      synced_tab_delegate_(new browser_sync::SyncedTabDelegateAndroid(this)),
+      hung_renderer_infobar_(nullptr) {
   Java_Tab_setNativePtr(env, obj, reinterpret_cast<intptr_t>(this));
 }
 
 TabAndroid::~TabAndroid() {
   GetContentLayer()->RemoveAllChildren();
   JNIEnv* env = base::android::AttachCurrentThread();
   Java_Tab_clearNativePtr(env, weak_java_tab_.get(env).obj());
 }
 
 base::android::ScopedJavaLocalRef<jobject> TabAndroid::GetJavaObject() {
@@ skipping 246 matching lines @@
 
   JNIEnv *env = base::android::AttachCurrentThread();
   Java_Tab_onFaviconAvailable(env, weak_java_tab_.get(env).obj(),
                               gfx::ConvertToJavaBitmap(&favicon).obj());
 }
 
 void TabAndroid::OnFaviconUpdated(favicon::FaviconDriver* favicon_driver,
                                   bool icon_url_changed) {
 }
 
+void TabAndroid::OnInfoBarRemoved(infobars::InfoBar* infobar, bool animate) {
+  if (hung_renderer_infobar_ && hung_renderer_infobar_ == infobar)
+    hung_renderer_infobar_ = nullptr;
+}
+
 void TabAndroid::Destroy(JNIEnv* env, jobject obj) {
   delete this;
 }
 
 void TabAndroid::InitWebContents(JNIEnv* env,
                                  jobject obj,
                                  jboolean incognito,
                                  jobject jcontent_view_core,
                                  jobject jweb_contents_delegate,
                                  jobject jcontext_menu_populator) {
@@ skipping 42 matching lines @@
 
   // Verify that the WebContents this tab represents matches the expected
   // off the record state.
   CHECK_EQ(GetProfile()->IsOffTheRecord(), incognito);
 
   InstantService* instant_service =
       InstantServiceFactory::GetForProfile(GetProfile());
   if (instant_service)
     instant_service->AddObserver(this);
 
+  InfoBarService* infobar_service =
+      InfoBarService::FromWebContents(web_contents());
+  if (infobar_service)
+    infobar_service->AddObserver(this);
+
   content_layer_->InsertChild(content_view_core->GetLayer(), 0);
 }
 
 void TabAndroid::DestroyWebContents(JNIEnv* env,
                                     jobject obj,
                                     jboolean delete_native) {
   DCHECK(web_contents());
 
   content::ContentViewCore* content_view_core = GetContentViewCore();
   if (content_view_core)
@@ skipping 13 matching lines @@
       favicon::ContentFaviconDriver::FromWebContents(web_contents_.get());
 
   if (favicon_driver)
     favicon_driver->RemoveObserver(this);
 
   InstantService* instant_service =
       InstantServiceFactory::GetForProfile(GetProfile());
   if (instant_service)
     instant_service->RemoveObserver(this);
 
+  InfoBarService* infobar_service =
+      InfoBarService::FromWebContents(web_contents());
+  if (infobar_service)
+    infobar_service->RemoveObserver(this);
+
   web_contents()->SetDelegate(NULL);
 
   if (delete_native) {
     // Terminate the renderer process if this is the last tab.
     // If there's no unload listener, FastShutdownForPageCount kills the
     // renderer process. Otherwise, we go with the slow path where renderer
     // process shuts down itself when ref count becomes 0.
     // This helps the render process exit quickly which avoids some issues
     // during shutdown. See https://codereview.chromium.org/146693011/
     // and http://crbug.com/338709 for details.
@@ skipping 288 matching lines @@
   }
 
   return -1;
 }
 
 bool TabAndroid::HasPrerenderedUrl(JNIEnv* env, jobject obj, jstring url) {
   GURL gurl(base::android::ConvertJavaStringToUTF8(env, url));
   return HasPrerenderedUrl(gurl);
 }
 
+void TabAndroid::ShowHungRendererInfoBar(JNIEnv* env, jobject obj) {
+  DCHECK(!hung_renderer_infobar_);
+  InfoBarService* infobar_service =
+      InfoBarService::FromWebContents(web_contents());
+  if (!infobar_service)
+    return;
+
+  scoped_ptr<ConfirmInfoBarDelegate> delegate(
+      new HungRendererInfoBarDelegate(web_contents()));
+  hung_renderer_infobar_ = infobar_service->AddInfoBar(
+      infobar_service->CreateConfirmInfoBar(delegate.Pass()));
+}
+
+void TabAndroid::DismissHungRendererInfoBar(JNIEnv* env, jobject obj) {
+  if (!hung_renderer_infobar_)

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

instead of hanging onto the infobar*, would it make sense to iterate through the
InfobarService/InfobarManager using infobar_count() and infobar_at() to get
access to the infobar?  it'd avoid having to observe the InfobarService and
would prevent us from ending up with the pointers out of sync.

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

How would we know we've found it while iterating if we don't store a handle to
it? We'd need some kind of ID or type identifier, right?

I suppose we could create a new InfoBarDelegate type and add some overloading to
the existing casting methods on the delegate, then just try casting all the
delegates (AsHungRendererInfoBarDelegate())  until we get a valid result, but
I'm not sure if that is any better...

[gone, 2015/08/21 21:39:30]

I think it'd be a little better safety-wise to add the
AsHungRendererInfoBarDelegate() call.  The number of infobars that are usually
visible is one or less, and we should be guaranteed a fresh pointer.  Could
always go for a second opinion, though.  Ping newt@?

+    return;
+
+  InfoBarService* infobar_service =
+      InfoBarService::FromWebContents(web_contents());
+  if (!infobar_service)
+    return;
+
+  infobar_service->RemoveInfoBar(hung_renderer_infobar_);
+}
+
 namespace {
 
 class ChromeInterceptNavigationDelegate : public InterceptNavigationDelegate {
  public:
   ChromeInterceptNavigationDelegate(JNIEnv* env, jobject jdelegate)
       : InterceptNavigationDelegate(env, jdelegate) {}
 
   bool ShouldIgnoreNavigation(
       const NavigationParams& navigation_params) override {
     NavigationParams chrome_navigation_params(navigation_params);
@@ skipping 73 matching lines @@
   //   s^{n+1} / s^{n} = 2100 / 2000
   //   s = 1.05
   //   s^b = 60000
   //   b = ln(60000) / ln(1.05) ~= 225
   UMA_HISTOGRAM_CUSTOM_TIMES("Startup.FirstCommitNavigationTime",
       base::Time::Now() - chrome::android::GetMainEntryPointTime(),
       base::TimeDelta::FromMilliseconds(1),
       base::TimeDelta::FromMinutes(1),
       225);
 }