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

Side by Side Diff: android_webview/java/src/org/chromium/android_webview/AwContentsClient.java

Issue 304763002: Trust the renderer's same-document navigation flag if it is a same-origin nav. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: isNavigationInPage->isFragmentNavigation, with caveat on the name Created 6 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/extensions/active_script_controller_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 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.android_webview; 5 package org.chromium.android_webview;
6 6
7 import android.content.pm.ActivityInfo; 7 import android.content.pm.ActivityInfo;
8 import android.graphics.Bitmap; 8 import android.graphics.Bitmap;
9 import android.graphics.Picture; 9 import android.graphics.Picture;
10 import android.net.http.SslError; 10 import android.net.http.SslError;
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 failingUrl); 82 failingUrl);
83 } 83 }
84 // Need to call onPageFinished after onReceivedError (if there i s an error) for 84 // Need to call onPageFinished after onReceivedError (if there i s an error) for
85 // backwards compatibility with the classic webview. 85 // backwards compatibility with the classic webview.
86 AwContentsClient.this.onPageFinished(failingUrl); 86 AwContentsClient.this.onPageFinished(failingUrl);
87 } 87 }
88 } 88 }
89 89
90 @Override 90 @Override
91 public void didNavigateMainFrame(String url, String baseUrl, 91 public void didNavigateMainFrame(String url, String baseUrl,
92 boolean isNavigationToDifferentPage, boolean isNavigationInPage) { 92 boolean isNavigationToDifferentPage, boolean isFragmentNavigatio n) {
93 // This is here to emulate the Classic WebView firing onPageFinished for main frame 93 // This is here to emulate the Classic WebView firing onPageFinished for main frame
94 // navigations where only the hash fragment changes. 94 // navigations where only the hash fragment changes.
95 if (isNavigationInPage) { 95 if (isFragmentNavigation) {
96 AwContentsClient.this.onPageFinished(url); 96 AwContentsClient.this.onPageFinished(url);
97 } 97 }
98 } 98 }
99 99
100 @Override 100 @Override
101 public void didNavigateAnyFrame(String url, String baseUrl, boolean isRe load) { 101 public void didNavigateAnyFrame(String url, String baseUrl, boolean isRe load) {
102 AwContentsClient.this.doUpdateVisitedHistory(url, isReload); 102 AwContentsClient.this.doUpdateVisitedHistory(url, isReload);
103 } 103 }
104 104
105 } 105 }
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
252 public abstract void onFindResultReceived(int activeMatchOrdinal, int number OfMatches, 252 public abstract void onFindResultReceived(int activeMatchOrdinal, int number OfMatches,
253 boolean isDoneCounting); 253 boolean isDoneCounting);
254 254
255 /** 255 /**
256 * Called whenever there is a new content picture available. 256 * Called whenever there is a new content picture available.
257 * @param picture New picture. 257 * @param picture New picture.
258 */ 258 */
259 public abstract void onNewPicture(Picture picture); 259 public abstract void onNewPicture(Picture picture);
260 260
261 } 261 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/extensions/active_script_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698