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

Side by Side Diff: chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java

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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 package org.chromium.chrome.browser.tab; 5 package org.chromium.chrome.browser.tab;
6 6
7 import android.app.Activity; 7 import android.app.Activity;
8 import android.content.Context; 8 import android.content.Context;
9 import android.content.Intent; 9 import android.content.Intent;
10 import android.content.res.Resources; 10 import android.content.res.Resources;
(...skipping 457 matching lines...) Expand 10 before | Expand all | Expand 10 after
468 String frameName, String targetUrl, WebContents newWebContents) { 468 String frameName, String targetUrl, WebContents newWebContents) {
469 for (TabObserver observer : mObservers) { 469 for (TabObserver observer : mObservers) {
470 observer.webContentsCreated(Tab.this, sourceWebContents, openerR enderFrameId, 470 observer.webContentsCreated(Tab.this, sourceWebContents, openerR enderFrameId,
471 frameName, targetUrl, newWebContents); 471 frameName, targetUrl, newWebContents);
472 } 472 }
473 } 473 }
474 474
475 @Override 475 @Override
476 public void rendererUnresponsive() { 476 public void rendererUnresponsive() {
477 super.rendererUnresponsive(); 477 super.rendererUnresponsive();
478 if (mNativeTabAndroid != 0) nativeOnRendererUnresponsive(mNativeTabA ndroid);
478 if (mFullscreenManager == null) return; 479 if (mFullscreenManager == null) return;
479 mFullscreenHungRendererToken = 480 mFullscreenHungRendererToken =
480 mFullscreenManager.showControlsPersistentAndClearOldToken( 481 mFullscreenManager.showControlsPersistentAndClearOldToken(
481 mFullscreenHungRendererToken); 482 mFullscreenHungRendererToken);
482 } 483 }
483 484
484 @Override 485 @Override
485 public void rendererResponsive() { 486 public void rendererResponsive() {
486 super.rendererResponsive(); 487 super.rendererResponsive();
488 if (mNativeTabAndroid != 0) nativeOnRendererResponsive(mNativeTabAnd roid);
487 if (mFullscreenManager == null) return; 489 if (mFullscreenManager == null) return;
488 mFullscreenManager.hideControlsPersistent(mFullscreenHungRendererTok en); 490 mFullscreenManager.hideControlsPersistent(mFullscreenHungRendererTok en);
489 mFullscreenHungRendererToken = FullscreenManager.INVALID_TOKEN; 491 mFullscreenHungRendererToken = FullscreenManager.INVALID_TOKEN;
490 } 492 }
491 493
492 @Override 494 @Override
493 public boolean isFullscreenForTabOrPending() { 495 public boolean isFullscreenForTabOrPending() {
494 return mFullscreenManager == null 496 return mFullscreenManager == null
495 ? false : mFullscreenManager.getPersistentFullscreenMode(); 497 ? false : mFullscreenManager.getPersistentFullscreenMode();
496 } 498 }
(...skipping 2379 matching lines...) Expand 10 before | Expand all | Expand 10 after
2876 private native String nativeGetOfflinePageOriginalUrl(long nativeTabAndroid) ; 2878 private native String nativeGetOfflinePageOriginalUrl(long nativeTabAndroid) ;
2877 private native void nativeSetInterceptNavigationDelegate(long nativeTabAndro id, 2879 private native void nativeSetInterceptNavigationDelegate(long nativeTabAndro id,
2878 InterceptNavigationDelegate delegate); 2880 InterceptNavigationDelegate delegate);
2879 private native void nativeAttachToTabContentManager(long nativeTabAndroid, 2881 private native void nativeAttachToTabContentManager(long nativeTabAndroid,
2880 TabContentManager tabContentManager); 2882 TabContentManager tabContentManager);
2881 private native void nativeAttachOverlayContentViewCore(long nativeTabAndroid , 2883 private native void nativeAttachOverlayContentViewCore(long nativeTabAndroid ,
2882 ContentViewCore content, boolean visible); 2884 ContentViewCore content, boolean visible);
2883 private native void nativeDetachOverlayContentViewCore(long nativeTabAndroid , 2885 private native void nativeDetachOverlayContentViewCore(long nativeTabAndroid ,
2884 ContentViewCore content); 2886 ContentViewCore content);
2885 private native boolean nativeHasPrerenderedUrl(long nativeTabAndroid, String url); 2887 private native boolean nativeHasPrerenderedUrl(long nativeTabAndroid, String url);
2888 private native void nativeOnRendererUnresponsive(long nativeTabAndroid);
2889 private native void nativeOnRendererResponsive(long nativeTabAndroid);
2886 2890
2887 private static native void nativeRecordStartupToCommitUma(); 2891 private static native void nativeRecordStartupToCommitUma();
2888 } 2892 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698