diff options
Diffstat (limited to 'chromium/chrome/android/java/src/org/chromium')
3 files changed, 6 insertions, 21 deletions
diff --git a/chromium/chrome/android/java/src/org/chromium/chrome/browser/accessibility/FontSizePrefs.java b/chromium/chrome/android/java/src/org/chromium/chrome/browser/accessibility/FontSizePrefs.java index 1398b0200b9..6edfbc23ffe 100644 --- a/chromium/chrome/android/java/src/org/chromium/chrome/browser/accessibility/FontSizePrefs.java +++ b/chromium/chrome/android/java/src/org/chromium/chrome/browser/accessibility/FontSizePrefs.java @@ -46,7 +46,6 @@ public class FontSizePrefs { private final ObserverList<FontSizePrefsObserver> mObserverList; private Float mSystemFontScaleForTests; - private boolean mTouchlessMode; /** * Interface for observing changes in font size-related preferences. @@ -154,16 +153,6 @@ public class FontSizePrefs { } /** - * Enables touchless mode. This overrides user's preference and always enables force enable - * zoom. - */ - public void enableTouchlessMode() { - mTouchlessMode = true; - FontSizePrefsJni.get().setForceEnableZoom( - mFontSizePrefsAndroidPtr, FontSizePrefs.this, true); - } - - /** * Returns whether forceEnableZoom is enabled. */ public boolean getForceEnableZoom() { @@ -185,9 +174,6 @@ public class FontSizePrefs { } private void setForceEnableZoom(boolean enabled, boolean fromUser) { - // Force enable zoom is always enabled in touchless mode and it should not be changed. - if (mTouchlessMode) return; - SharedPreferences.Editor sharedPreferencesEditor = ContextUtils.getAppSharedPreferences().edit(); sharedPreferencesEditor.putBoolean(PREF_USER_SET_FORCE_ENABLE_ZOOM, fromUser); diff --git a/chromium/chrome/android/java/src/org/chromium/chrome/browser/printing/PrintShareActivity.java b/chromium/chrome/android/java/src/org/chromium/chrome/browser/printing/PrintShareActivity.java index 72ca07ef30b..75a972b9b41 100644 --- a/chromium/chrome/android/java/src/org/chromium/chrome/browser/printing/PrintShareActivity.java +++ b/chromium/chrome/android/java/src/org/chromium/chrome/browser/printing/PrintShareActivity.java @@ -9,7 +9,6 @@ import org.chromium.chrome.browser.ChromeActivity; import org.chromium.chrome.browser.preferences.PrefServiceBridge; import org.chromium.chrome.browser.share.ShareActivity; import org.chromium.chrome.browser.tab.Tab; -import org.chromium.chrome.browser.util.FeatureUtilities; import org.chromium.printing.PrintingController; import org.chromium.printing.PrintingControllerImpl; @@ -23,9 +22,6 @@ public class PrintShareActivity extends ShareActivity { } public static boolean featureIsAvailable(Tab currentTab) { - // TODO(https://crbug.com/981065): The Share Sheet printing item gets disabled while the - // share sheet is still active in NoTouch mode. Remove this restriction once fixed. - if (FeatureUtilities.isNoTouchModeEnabled()) return false; PrintingController printingController = PrintingControllerImpl.getInstance(); return (printingController != null && !currentTab.isNativePage() && !currentTab.isShowingInterstitialPage() && !printingController.isBusy() diff --git a/chromium/chrome/android/java/src/org/chromium/chrome/browser/printing/TabPrinter.java b/chromium/chrome/android/java/src/org/chromium/chrome/browser/printing/TabPrinter.java index 829fae50518..ffa94ee1a6f 100644 --- a/chromium/chrome/android/java/src/org/chromium/chrome/browser/printing/TabPrinter.java +++ b/chromium/chrome/android/java/src/org/chromium/chrome/browser/printing/TabPrinter.java @@ -10,6 +10,7 @@ import org.chromium.base.ContextUtils; import org.chromium.base.Log; import org.chromium.base.annotations.CalledByNative; import org.chromium.base.annotations.JNINamespace; +import org.chromium.base.annotations.NativeMethods; import org.chromium.chrome.R; import org.chromium.chrome.browser.tab.Tab; import org.chromium.content_public.browser.WebContents; @@ -46,7 +47,7 @@ public class TabPrinter implements Printable { if (!canPrint()) return false; Tab tab = mTab.get(); assert tab != null && tab.isInitialized(); - return nativePrint(tab.getWebContents(), renderProcessId, renderFrameId); + return TabPrinterJni.get().print(tab.getWebContents(), renderProcessId, renderFrameId); } @Override @@ -74,6 +75,8 @@ public class TabPrinter implements Printable { return true; } - private static native boolean nativePrint( - WebContents webContents, int renderProcessId, int renderFrameId); + @NativeMethods + interface Natives { + boolean print(WebContents webContents, int renderProcessId, int renderFrameId); + } } |