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

Unified Diff: chrome/browser/android/chrome_web_contents_delegate_android.cc

Issue 1358923002: Extract TabChromeWebContentsDelegateAndroid into a separate class. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@chrometab10
Patch Set: Move renderer hung calls 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/android/chrome_web_contents_delegate_android.cc
diff --git a/chrome/browser/android/chrome_web_contents_delegate_android.cc b/chrome/browser/android/chrome_web_contents_delegate_android.cc
index 1fb8fcf3d78f72254703226bbd8016c48bcbaaca..1a5d358e21e5e5716bb116fbf1dab55b3f9d4198 100644
--- a/chrome/browser/android/chrome_web_contents_delegate_android.cc
+++ b/chrome/browser/android/chrome_web_contents_delegate_android.cc
@@ -8,8 +8,10 @@
#include "base/android/jni_string.h"
#include "base/command_line.h"
#include "chrome/browser/android/feature_utilities.h"
+#include "chrome/browser/android/hung_renderer_infobar_delegate.h"
#include "chrome/browser/chrome_notification_types.h"
#include "chrome/browser/file_select_helper.h"
+#include "chrome/browser/infobars/infobar_service.h"
#include "chrome/browser/media/media_capture_devices_dispatcher.h"
#include "chrome/browser/media/media_stream_capture_indicator.h"
#include "chrome/browser/media/protected_media_identifier_permission_context.h"
@@ -25,6 +27,7 @@
#include "chrome/browser/ui/tab_helpers.h"
#include "chrome/common/chrome_switches.h"
#include "components/app_modal/javascript_dialog_manager.h"
+#include "components/infobars/core/infobar.h"
#include "content/public/browser/notification_details.h"
#include "content/public/browser/notification_service.h"
#include "content/public/browser/notification_source.h"
@@ -72,6 +75,16 @@ ScopedJavaLocalRef<jobject> CreateJavaRect(
static_cast<int>(rect.bottom())));
}
+infobars::InfoBar* FindHungRendererInfoBar(InfoBarService* infobar_service) {
+ DCHECK(infobar_service);
+ for (size_t i = 0; i < infobar_service->infobar_count(); ++i) {
+ infobars::InfoBar* infobar = infobar_service->infobar_at(i);
+ if (infobar->delegate()->AsHungRendererInfoBarDelegate())
+ return infobar;
+ }
+ return nullptr;
+}
+
} // anonymous namespace
namespace chrome {
@@ -386,6 +399,36 @@ void ChromeWebContentsDelegateAndroid::AddNewContents(
} // namespace android
} // namespace chrome
+void OnRendererUnresponsive(JNIEnv* env,
+ const JavaParamRef<jclass>& clazz,
+ const JavaParamRef<jobject>& java_web_contents) {
+ content::WebContents* web_contents =
+ content::WebContents::FromJavaWebContents(java_web_contents);
+ InfoBarService* infobar_service =
+ InfoBarService::FromWebContents(web_contents);
+ DCHECK(!FindHungRendererInfoBar(infobar_service));
+ HungRendererInfoBarDelegate::Create(infobar_service,
+ web_contents->GetRenderProcessHost());
+}
+
+void OnRendererResponsive(JNIEnv* env,
+ const JavaParamRef<jclass>& clazz,
+ const JavaParamRef<jobject>& java_web_contents) {
+ content::WebContents* web_contents =
+ content::WebContents::FromJavaWebContents(java_web_contents);
+ InfoBarService* infobar_service =
+ InfoBarService::FromWebContents(web_contents);
+ infobars::InfoBar* hung_renderer_infobar =
+ FindHungRendererInfoBar(infobar_service);
+ if (!hung_renderer_infobar)
+ return;
+
+ hung_renderer_infobar->delegate()
+ ->AsHungRendererInfoBarDelegate()
+ ->OnRendererResponsive();
+ infobar_service->RemoveInfoBar(hung_renderer_infobar);
+}
+
jboolean IsCapturingAudio(JNIEnv* env,
const JavaParamRef<jclass>& clazz,
const JavaParamRef<jobject>& java_web_contents) {

Powered by Google App Engine
This is Rietveld 408576698