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

Side by Side Diff: content/public/android/java/src/org/chromium/content/browser/ContentViewCore.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
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.content.browser; 5 package org.chromium.content.browser;
6 6
7 import android.annotation.SuppressLint; 7 import android.annotation.SuppressLint;
8 import android.app.Activity; 8 import android.app.Activity;
9 import android.app.SearchManager; 9 import android.app.SearchManager;
10 import android.content.ContentResolver; 10 import android.content.ContentResolver;
(...skipping 601 matching lines...) Expand 10 before | Expand all | Expand 10 after
612 if (R.string.accessibility_content_view == 0) { 612 if (R.string.accessibility_content_view == 0) {
613 Log.w(TAG, "Setting contentDescription to 'Web View' as no value was specified."); 613 Log.w(TAG, "Setting contentDescription to 'Web View' as no value was specified.");
614 } else { 614 } else {
615 contentDescription = mContext.getResources().getString( 615 contentDescription = mContext.getResources().getString(
616 R.string.accessibility_content_view); 616 R.string.accessibility_content_view);
617 } 617 }
618 mContainerView.setContentDescription(contentDescription); 618 mContainerView.setContentDescription(contentDescription);
619 mWebContentsObserver = new WebContentsObserverAndroid(this) { 619 mWebContentsObserver = new WebContentsObserverAndroid(this) {
620 @Override 620 @Override
621 public void didNavigateMainFrame(String url, String baseUrl, 621 public void didNavigateMainFrame(String url, String baseUrl,
622 boolean isNavigationToDifferentPage, boolean isNavigationInP age) { 622 boolean isNavigationToDifferentPage, boolean isFragmentNavig ation) {
623 if (!isNavigationToDifferentPage) return; 623 if (!isNavigationToDifferentPage) return;
624 hidePopups(); 624 hidePopups();
625 resetScrollInProgress(); 625 resetScrollInProgress();
626 resetGestureDetection(); 626 resetGestureDetection();
627 } 627 }
628 628
629 @Override 629 @Override
630 public void renderProcessGone(boolean wasOomProtected) { 630 public void renderProcessGone(boolean wasOomProtected) {
631 hidePopups(); 631 hidePopups();
632 resetScrollInProgress(); 632 resetScrollInProgress();
(...skipping 2591 matching lines...) Expand 10 before | Expand all | Expand 10 after
3224 boolean enableHiding, boolean enableShowing, boolean animate); 3224 boolean enableHiding, boolean enableShowing, boolean animate);
3225 3225
3226 private native void nativeShowImeIfNeeded(long nativeContentViewCoreImpl); 3226 private native void nativeShowImeIfNeeded(long nativeContentViewCoreImpl);
3227 3227
3228 private native void nativeSetAccessibilityEnabled( 3228 private native void nativeSetAccessibilityEnabled(
3229 long nativeContentViewCoreImpl, boolean enabled); 3229 long nativeContentViewCoreImpl, boolean enabled);
3230 3230
3231 private native void nativeExtractSmartClipData(long nativeContentViewCoreImp l, 3231 private native void nativeExtractSmartClipData(long nativeContentViewCoreImp l,
3232 int x, int y, int w, int h); 3232 int x, int y, int w, int h);
3233 } 3233 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698