[image search] Remove image search privacy notice, part 1
The search notifier to notify the image search feature is not wanted
for the updated spec. This cl removes the search notifier view
creation and some implementation of the search notifier controller.
After this cl, the search notifier controller will be created but not
used and the search notifier view will be empty. The main reason is
that there will be a search category filter nudge that is expected to
replace the current search notifier soon. Only the contents of view
will be changed and the controller will do the same thing. Added TODOs
to make sure the clean up is tracked.
Bug: 311785210
Change-Id: I02c5cdc2c3aaf0a285600e7081d55b90c49b6ef4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5064233
Reviewed-by: Toni Barzic <[email protected]>
Reviewed-by: Ahmed Fakhry <[email protected]>
Commit-Queue: Wen-Chien Wang <[email protected]>
Reviewed-by: Tommy Nyquist <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1231092}
diff --git a/chrome/browser/ash/accessibility/spoken_feedback_app_list_browsertest.cc b/chrome/browser/ash/accessibility/spoken_feedback_app_list_browsertest.cc
index d30e58e..601c92c 100644
--- a/chrome/browser/ash/accessibility/spoken_feedback_app_list_browsertest.cc
+++ b/chrome/browser/ash/accessibility/spoken_feedback_app_list_browsertest.cc
@@ -784,9 +784,6 @@
}
IN_PROC_BROWSER_TEST_P(SpokenFeedbackAppListSearchTest, LauncherSearch) {
- // Disable search notifier to simplify the test.
- AppListTestApi().DisableSearchNotifier(true);
-
EnableChromeVox();
ShowAppList();
@@ -991,35 +988,6 @@
sm_.Replay();
}
-IN_PROC_BROWSER_TEST_P(SpokenFeedbackAppListSearchTest,
- SearchNotifierAnnouncement) {
- EnableChromeVox();
- ShowAppList();
-
- sm_.ExpectSpeechPattern("Search your *");
- sm_.ExpectSpeech("Edit text");
-
- sm_.Call([this]() {
- apps_provider_->set_best_match_count(2);
- apps_provider_->set_count(3);
- web_provider_->set_count(4);
- SendKeyPress(ui::VKEY_G);
- });
-
- // Announce that there is a image search notifier.
- sm_.ExpectSpeech("G");
- sm_.ExpectSpeech("Displaying 8 results for g");
- sm_.ExpectSpeech("Find your images by the content");
- sm_.ExpectSpeech("Press shift plus tab to learn more");
-
- // Verify the notifier announcement on focus.
- sm_.Call([this]() { SendKeyPressWithShift(ui::VKEY_TAB); });
- sm_.ExpectSpeech("Continue");
- sm_.ExpectSpeechPattern("Try searching *");
-
- sm_.Replay();
-}
-
IN_PROC_BROWSER_TEST_P(SpokenFeedbackAppListSearchTest, SearchCategoryFilter) {
EnableChromeVox();
ShowAppList();
@@ -1037,11 +1005,6 @@
sm_.ExpectSpeech("G");
sm_.ExpectSpeech("Displaying 8 results for g");
- // Move focus to the search notifier.
- sm_.Call([this]() { SendKeyPressWithShift(ui::VKEY_TAB); });
- sm_.ExpectSpeech("Continue");
- sm_.ExpectSpeechPattern("Try searching *");
-
// Move focus to the close button.
sm_.Call([this]() { SendKeyPress(ui::VKEY_UP); });
sm_.ExpectSpeech("Clear searchbox text");
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 6b4daf9..2944c8f 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -982,6 +982,12 @@
constexpr char kPasswordChangeSuccessTrackerVersion[] =
"password_manager.password_change_success_tracker.version";
+// Deprecated 11/2023.
+#if BUILDFLAG(IS_CHROMEOS_ASH)
+constexpr char kImageSearchPrivacyNotice[] =
+ "ash.launcher.image_search_privacy_notice";
+#endif // BUILDFLAG(IS_CHROMEOS_ASH)
+
// Register local state used only for migration (clearing or moving to a new
// key).
void RegisterLocalStatePrefsForMigration(PrefRegistrySimple* registry) {
@@ -1393,6 +1399,11 @@
// Deprecated 11/2023.
registry->RegisterListPref(kPasswordChangeSuccessTrackerFlows);
registry->RegisterIntegerPref(kPasswordChangeSuccessTrackerVersion, 0);
+
+ // Deprecated 11/2023.
+#if BUILDFLAG(IS_CHROMEOS_ASH)
+ registry->RegisterDictionaryPref(kImageSearchPrivacyNotice);
+#endif // BUILDFLAG(IS_CHROMEOS_ASH)
}
void ClearSyncRequestedPrefAndMaybeMigrate(PrefService* profile_prefs) {
@@ -2619,6 +2630,11 @@
profile_prefs->ClearPref(kPasswordChangeSuccessTrackerFlows);
profile_prefs->ClearPref(kPasswordChangeSuccessTrackerVersion);
+#if BUILDFLAG(IS_CHROMEOS_ASH)
+ // Deprecated 11/2023
+ profile_prefs->ClearPref(kImageSearchPrivacyNotice);
+#endif // BUILDFLAG(IS_CHROMEOS_ASH)
+
// Please don't delete the following line. It is used by PRESUBMIT.py.
// END_MIGRATE_OBSOLETE_PROFILE_PREFS
