Add feature to control Focus on Omnibox in incognito tab intents.
Incognito tab launcher intents are followed by focus on Omnibox and
partially hiding incognito NTP message and totally hiding incognito
tab counter.
This behavior is moved behind "kFocusOnOmniboxInIncognitoTabIntents"
feature. The feature is disabled by default until appropriate privacy
notice is added.
Bug: 1029018
Change-Id: I9e1152b747f6d0d02aa6e31263a36c345ff77dab
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1941309
Reviewed-by: Yaron Friedman <yfriedman@chromium.org>
Reviewed-by: Peter Conn <peconn@chromium.org>
Commit-Queue: Ramin Halavati <rhalavati@chromium.org>
Cr-Commit-Position: refs/heads/master@{#720869}
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureList.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureList.java
index 5ca485b16..c73d800 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureList.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureList.java
@@ -247,6 +247,8 @@
public static final String EPHEMERAL_TAB_USING_BOTTOM_SHEET = "EphemeralTabUsingBottomSheet";
public static final String EXPLICIT_LANGUAGE_ASK = "ExplicitLanguageAsk";
public static final String EXPLORE_SITES = "ExploreSites";
+ public static final String FOCUS_OMNIBOX_IN_INCOGNITO_TAB_INTENTS =
+ "FocusOmniboxInIncognitoTabIntents";
public static final String OFFLINE_HOME = "OfflineHome";
public static final String GENERIC_SENSOR_EXTRA_CLASSES = "GenericSensorExtraClasses";
public static final String GRANT_NOTIFICATIONS_TO_DSE = "GrantNotificationsToDSE";
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
index d9c57ed..8c58dd9 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
@@ -1467,14 +1467,15 @@
} else if (IncognitoTabLauncher.didCreateIntent(intent)) {
Tab tab = getTabCreator(true).launchUrl(UrlConstants.NTP_URL,
TabLaunchType.FROM_LAUNCH_NEW_INCOGNITO_TAB);
- // Since the Tab is created in the foreground, its View will gain focus,
- // and since the Tab and the URL bar are not yet in the same View
- // hierarchy, setting the URL bar's focus here won't clear the Tab's
- // focus.
- // When the Tab is added to the hierarchy, we want the URL bar to retain
- // focus, so we clear the Tab's focus here.
- tab.getView().clearFocus();
- focus = true;
+ if (IncognitoTabLauncher.shouldFocusOmnibox()) {
+ // Since the Tab is created in the foreground, its View will gain
+ // focus, and since the Tab and the URL bar are not yet in the same
+ // View hierarchy, setting the URL bar's focus here won't clear the
+ // Tab's focus. When the Tab is added to the hierarchy, we want the
+ // URL bar to retain focus, so we clear the Tab's focus here.
+ tab.getView().clearFocus();
+ focus = true;
+ }
IncognitoTabLauncher.recordUse();
} else {
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/incognito/IncognitoTabLauncher.java b/chrome/android/java/src/org/chromium/chrome/browser/incognito/IncognitoTabLauncher.java
index fec37c0..3573b47 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/incognito/IncognitoTabLauncher.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/incognito/IncognitoTabLauncher.java
@@ -75,6 +75,14 @@
}
/**
+ * Returns whether the omnibox should be focused after launching the incognito tab.
+ */
+ public static boolean shouldFocusOmnibox() {
+ return ChromeFeatureList.isEnabled(
+ ChromeFeatureList.FOCUS_OMNIBOX_IN_INCOGNITO_TAB_INTENTS);
+ }
+
+ /**
* Records UMA that a new incognito tab has been launched as a result of this Activity.
*/
public static void recordUse() {
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/incognito/IncognitoTabLauncherTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/incognito/IncognitoTabLauncherTest.java
index 2c2219a..a1105547 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/incognito/IncognitoTabLauncherTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/incognito/IncognitoTabLauncherTest.java
@@ -65,6 +65,7 @@
@Test
@Feature("Incognito")
@MediumTest
+ @Features.EnableFeatures({ChromeFeatureList.FOCUS_OMNIBOX_IN_INCOGNITO_TAB_INTENTS})
public void testLaunchIncognitoNewTab_omniboxFocused() {
ChromeTabbedActivity activity = launchIncognitoTab();
CriteriaHelper.pollUiThread(() -> activity.getToolbarManager().isUrlBarFocused());
diff --git a/chrome/browser/android/chrome_feature_list.cc b/chrome/browser/android/chrome_feature_list.cc
index 116ef3b9..f61532f 100644
--- a/chrome/browser/android/chrome_feature_list.cc
+++ b/chrome/browser/android/chrome_feature_list.cc
@@ -142,6 +142,7 @@
&kEphemeralTab,
&kEphemeralTabUsingBottomSheet,
&kExploreSites,
+ &kFocusOmniboxInIncognitoTabIntents,
&kHandleMediaIntents,
&kHomepageLocation,
&kHorizontalTabSwitcherAndroid,
@@ -267,6 +268,9 @@
const base::Feature kAllowNewIncognitoTabIntents{
"AllowNewIncognitoTabIntents", base::FEATURE_ENABLED_BY_DEFAULT};
+const base::Feature kFocusOmniboxInIncognitoTabIntents{
+ "FocusOmniboxInIncognitoTabIntents", base::FEATURE_DISABLED_BY_DEFAULT};
+
const base::Feature kAllowRemoteContextForNotifications{
"AllowRemoteContextForNotifications", base::FEATURE_ENABLED_BY_DEFAULT};
diff --git a/chrome/browser/android/chrome_feature_list.h b/chrome/browser/android/chrome_feature_list.h
index dca0320..a6461cb 100644
--- a/chrome/browser/android/chrome_feature_list.h
+++ b/chrome/browser/android/chrome_feature_list.h
@@ -73,6 +73,7 @@
extern const base::Feature kEphemeralTab;
extern const base::Feature kEphemeralTabUsingBottomSheet;
extern const base::Feature kExploreSites;
+extern const base::Feature kFocusOmniboxInIncognitoTabIntents;
extern const base::Feature kHandleMediaIntents;
extern const base::Feature kHomepageLocation;
extern const base::Feature kHorizontalTabSwitcherAndroid;
