summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortedchoc@chromium.org <tedchoc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-17 21:57:19 +0000
committertedchoc@chromium.org <tedchoc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-17 21:57:19 +0000
commit96bffba4d0246adb7d7e7b8edaef460ae1eaea91 (patch)
treeaf18e32bd98ec76a19ddcf7cee96bf461e4fb1f2
parent840bad67c5c237ac0e79c67c54baac684435b6f0 (diff)
downloadchromium_src-96bffba4d0246adb7d7e7b8edaef460ae1eaea91.zip
chromium_src-96bffba4d0246adb7d7e7b8edaef460ae1eaea91.tar.gz
chromium_src-96bffba4d0246adb7d7e7b8edaef460ae1eaea91.tar.bz2
Add supoort for stop page loads in TabBase.
Always use the contentviewcore if present as it controls navigation even if native pages are present. BUG=291279 R=newt@chromium.org NOTRY=true Review URL: https://codereview.chromium.org/27597002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@229234 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/android/java/src/org/chromium/chrome/browser/TabBase.java8
1 files changed, 6 insertions, 2 deletions
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/TabBase.java b/chrome/android/java/src/org/chromium/chrome/browser/TabBase.java
index 7cdfff6..7d2a5a3 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/TabBase.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/TabBase.java
@@ -293,8 +293,12 @@ public abstract class TabBase implements NavigationClient {
*/
public void reload() {
// TODO(dtrainor): Should we try to rebuild the ContentView if it's frozen?
- ContentViewCore contentViewCore = getContentViewCore();
- if (contentViewCore != null) contentViewCore.reload();
+ if (mContentViewCore != null) mContentViewCore.reload();
+ }
+
+ /** Stop the current navigation. */
+ public void stopLoading() {
+ if (mContentViewCore != null) mContentViewCore.stopLoading();
}
/**