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

Side by Side Diff: content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java

Issue 11228010: Do not wait for the double tap timeout on pages with fixed page scale (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Added new method to mock child classes in test file Created 8 years, 1 month 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 | content/public/android/java/src/org/chromium/content/browser/ContentViewGestureHandler.java » ('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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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.app.Activity; 7 import android.app.Activity;
8 import android.content.Context; 8 import android.content.Context;
9 import android.content.pm.ActivityInfo; 9 import android.content.pm.ActivityInfo;
10 import android.content.pm.PackageManager; 10 import android.content.pm.PackageManager;
(...skipping 953 matching lines...) Expand 10 before | Expand all | Expand 10 after
964 public ContentSettings getContentSettings() { 964 public ContentSettings getContentSettings() {
965 return mContentSettings; 965 return mContentSettings;
966 } 966 }
967 967
968 @Override 968 @Override
969 public boolean didUIStealScroll(float x, float y) { 969 public boolean didUIStealScroll(float x, float y) {
970 return getContentViewClient().shouldOverrideScroll( 970 return getContentViewClient().shouldOverrideScroll(
971 x, y, computeHorizontalScrollOffset(), computeVerticalScrollOffs et()); 971 x, y, computeHorizontalScrollOffset(), computeVerticalScrollOffs et());
972 } 972 }
973 973
974 @Override
975 public boolean hasFixedPageScale() {
976 return mNativeMinimumScale == mNativeMaximumScale;
977 }
978
974 private void hidePopupDialog() { 979 private void hidePopupDialog() {
975 SelectPopupDialog.hide(this); 980 SelectPopupDialog.hide(this);
976 } 981 }
977 982
978 void hideSelectActionBar() { 983 void hideSelectActionBar() {
979 if (mActionBarVisible) { 984 if (mActionBarVisible) {
980 mActionBarVisible = false; 985 mActionBarVisible = false;
981 mImeAdapter.unselect(); 986 mImeAdapter.unselect();
982 getContentViewClient().onContextualActionBarHidden(); 987 getContentViewClient().onContextualActionBarHidden();
983 } 988 }
(...skipping 1208 matching lines...) Expand 10 before | Expand all | Expand 10 after
2192 private native void nativeAddJavascriptInterface(int nativeContentViewCoreIm pl, Object object, 2197 private native void nativeAddJavascriptInterface(int nativeContentViewCoreIm pl, Object object,
2193 String name, boolean requir eAnnotation); 2198 String name, boolean requir eAnnotation);
2194 2199
2195 private native void nativeRemoveJavascriptInterface(int nativeContentViewCor eImpl, String name); 2200 private native void nativeRemoveJavascriptInterface(int nativeContentViewCor eImpl, String name);
2196 2201
2197 private native int nativeGetNavigationHistory(int nativeContentViewCoreImpl, Object context); 2202 private native int nativeGetNavigationHistory(int nativeContentViewCoreImpl, Object context);
2198 2203
2199 private native void nativeUpdateVSyncParameters(int nativeContentViewCoreImp l, 2204 private native void nativeUpdateVSyncParameters(int nativeContentViewCoreImp l,
2200 long timebaseMicros, long intervalMicros); 2205 long timebaseMicros, long intervalMicros);
2201 } 2206 }
OLDNEW
« no previous file with comments | « no previous file | content/public/android/java/src/org/chromium/content/browser/ContentViewGestureHandler.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698