41 lines
2.1 KiB
Diff
41 lines
2.1 KiB
Diff
From: csagan5 <32685696+csagan5@users.noreply.github.com>
|
|
Date: Fri, 24 Jan 2020 19:17:22 +0100
|
|
Subject: Disable smart selection by default
|
|
|
|
Allow web search in incognito mode (reverts
|
|
commit 48d4ae54f7565c429bf29cd63806aee5d7e93e69)
|
|
|
|
Notice that re-enabling smart selection would make incognito mode potentially
|
|
leak information through the TextClassifier set by OEM, if any
|
|
---
|
|
chrome/browser/flags/android/chrome_feature_list.cc | 2 +-
|
|
.../content/browser/selection/SelectionPopupControllerImpl.java | 2 +-
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
|
|
--- a/chrome/browser/flags/android/chrome_feature_list.cc
|
|
+++ b/chrome/browser/flags/android/chrome_feature_list.cc
|
|
@@ -476,7 +476,7 @@ const base::Feature kDownloadProgressInfoBar{"DownloadProgressInfoBar",
|
|
base::FEATURE_ENABLED_BY_DEFAULT};
|
|
|
|
const base::Feature kDownloadFileProvider{"DownloadFileProvider",
|
|
- base::FEATURE_ENABLED_BY_DEFAULT};
|
|
+ base::FEATURE_DISABLED_BY_DEFAULT};
|
|
|
|
const base::Feature kDownloadNotificationBadge{
|
|
"DownloadNotificationBadge", base::FEATURE_ENABLED_BY_DEFAULT};
|
|
diff --git a/content/public/android/java/src/org/chromium/content/browser/selection/SelectionPopupControllerImpl.java b/content/public/android/java/src/org/chromium/content/browser/selection/SelectionPopupControllerImpl.java
|
|
--- a/content/public/android/java/src/org/chromium/content/browser/selection/SelectionPopupControllerImpl.java
|
|
+++ b/content/public/android/java/src/org/chromium/content/browser/selection/SelectionPopupControllerImpl.java
|
|
@@ -831,7 +831,7 @@ public class SelectionPopupControllerImpl extends ActionModeCallbackHelper
|
|
menu.removeItem(R.id.select_action_menu_share);
|
|
}
|
|
|
|
- if (isFocusedNodeEditable() || isIncognito()
|
|
+ if (isFocusedNodeEditable()
|
|
|| !isSelectActionModeAllowed(MENU_ITEM_WEB_SEARCH)) {
|
|
menu.removeItem(R.id.select_action_menu_web_search);
|
|
}
|
|
--
|
|
2.17.1
|
|
|