summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chrome/app/generated_resources.grd14
-rw-r--r--chrome/browser/about_flags.cc17
-rw-r--r--chrome/browser/chromeos/launcher_search_provider/service.cc14
-rw-r--r--chrome/browser/ui/app_list/search/search_controller_factory.cc2
-rw-r--r--tools/metrics/histograms/histograms.xml2
-rw-r--r--ui/app_list/app_list_switches.cc23
-rw-r--r--ui/app_list/app_list_switches.h5
7 files changed, 19 insertions, 58 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 87e7a51..0562add 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -6443,17 +6443,11 @@ Keep your key file in a safe place. You will need it to create new versions of y
<message name="IDS_FLAGS_ENABLE_SYNC_APP_LIST_DESCRIPTION" desc="Description for the flag to enable syncing the app list.">
Enable App Launcher sync. This also enables Folders where available (non OSX).
</message>
- <message name="IDS_FLAGS_DISABLE_DRIVE_SEARCH_IN_APP_LAUNCHER" desc="Name of the flag to disable drive search in app launcher.">
- Disable Drive search in Chrome App Launcher.
+ <message name="IDS_FLAGS_ENABLE_LAUNCHER_SEARCH_PROVIDER_API" desc="Name of the flag to enable launcher search provider api.">
+ Enable Launcher Search Provider API.
</message>
- <message name="IDS_FLAGS_DISABLE_DRIVE_SEARCH_IN_APP_LAUNCHER_DESCRIPTION" desc="Description for the flag to disable drive search in app launcher.">
- Files from Drive will no longer show up when searching in the Chrome App Launcher.
- </message>
- <message name="IDS_FLAGS_DISABLE_LAUNCHER_SEARCH_PROVIDER_API" desc="Name of the flag to disable launcher search provider api.">
- Disable the public Launcher Search Provider API.
- </message>
- <message name="IDS_FLAGS_DISABLE_LAUNCHER_SEARCH_PROVIDER_API_DESCRIPTION" desc="Description for the flag to disable launcher search provider api.">
- Disable the public version of the Launcher Search Provider API. This API allows apps/extensions to listen to searches in the Chrome App Launcher and respond with search results. This flag does not affect Drive search.
+ <message name="IDS_FLAGS_ENABLE_LAUNCHER_SEARCH_PROVIDER_API_DESCRIPTION" desc="Description for the flag to enable launcher search provider api.">
+ This API allows extensions to listen queries of the Chrome Launcher and return their search results to it.
</message>
<if expr="is_macosx">
<message name="IDS_FLAGS_ENABLE_AVFOUNDATION_NAME" desc="Name of the flag to enable Mac AVFoundation.">
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index af26eee..09fb8e9 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -1908,19 +1908,14 @@ const Experiment kExperiments[] = {
kOsAll,
SINGLE_VALUE_TYPE(switches::kEnableMediaRouter)},
#endif // defined(ENABLE_MEDIA_ROUTER)
-// Since kDisableDriveSearchInAppLauncher and kDisableLauncherSearchProviderAPI
-// are not available when app list is disabled, flag guard them.
+// Since kEnableLauncherSearchProviderApi is not available when app list is
+// disabled, flag guard enable-launcher-search-provider-api.
#if defined(ENABLE_APP_LIST)
- {"disable-drive-search-in-app-launcher",
- IDS_FLAGS_DISABLE_DRIVE_SEARCH_IN_APP_LAUNCHER,
- IDS_FLAGS_DISABLE_DRIVE_SEARCH_IN_APP_LAUNCHER_DESCRIPTION,
+ {"enable-launcher-search-provider-api",
+ IDS_FLAGS_ENABLE_LAUNCHER_SEARCH_PROVIDER_API,
+ IDS_FLAGS_ENABLE_LAUNCHER_SEARCH_PROVIDER_API_DESCRIPTION,
kOsCrOS,
- SINGLE_VALUE_TYPE(app_list::switches::kDisableDriveSearchInAppLauncher)},
- {"disable-launcher-search-provider-api",
- IDS_FLAGS_DISABLE_LAUNCHER_SEARCH_PROVIDER_API,
- IDS_FLAGS_DISABLE_LAUNCHER_SEARCH_PROVIDER_API_DESCRIPTION,
- kOsCrOS,
- SINGLE_VALUE_TYPE(app_list::switches::kDisableLauncherSearchProviderApi)},
+ SINGLE_VALUE_TYPE(app_list::switches::kEnableLauncherSearchProviderApi)},
#endif // defined(ENABLE_APP_LIST)
#if defined(OS_CHROMEOS)
{"disable-mtp-write-support",
diff --git a/chrome/browser/chromeos/launcher_search_provider/service.cc b/chrome/browser/chromeos/launcher_search_provider/service.cc
index fdbcba0..894b315 100644
--- a/chrome/browser/chromeos/launcher_search_provider/service.cc
+++ b/chrome/browser/chromeos/launcher_search_provider/service.cc
@@ -6,14 +6,12 @@
#include "base/memory/scoped_vector.h"
#include "base/strings/utf_string_conversions.h"
-#include "chrome/browser/chromeos/file_manager/app_id.h"
#include "chrome/browser/chromeos/launcher_search_provider/service_factory.h"
#include "chrome/browser/ui/app_list/search/launcher_search/launcher_search_provider.h"
#include "chrome/browser/ui/app_list/search/launcher_search/launcher_search_result.h"
#include "extensions/browser/extension_registry.h"
#include "extensions/common/extension_set.h"
#include "extensions/common/permissions/permissions_data.h"
-#include "ui/app_list/app_list_switches.h"
namespace api_launcher_search_provider =
extensions::api::launcher_search_provider;
@@ -169,16 +167,8 @@ void Service::CacheListenerExtensionIds() {
extension->permissions_data();
const bool has_permission = permission_data->HasAPIPermission(
extensions::APIPermission::kLauncherSearchProvider);
- if (has_permission) {
- // If extension id is file manager, it can be added only when drive search
- // is enabled. For other extensions, it can be added only when launcher
- // search provider API is enabled.
- if ((extension->id() == file_manager::kFileManagerAppId &&
- app_list::switches::IsDriveSearchEnabled()) ||
- (extension->id() != file_manager::kFileManagerAppId &&
- app_list::switches::IsLauncherSearchProviderApiEnabled()))
- cached_listener_extension_ids_->insert(extension->id());
- }
+ if (has_permission)
+ cached_listener_extension_ids_->insert(extension->id());
}
}
diff --git a/chrome/browser/ui/app_list/search/search_controller_factory.cc b/chrome/browser/ui/app_list/search/search_controller_factory.cc
index ff7a448..9f4b4c1 100644
--- a/chrome/browser/ui/app_list/search/search_controller_factory.cc
+++ b/chrome/browser/ui/app_list/search/search_controller_factory.cc
@@ -105,7 +105,7 @@ scoped_ptr<SearchController> CreateSearchController(
// LauncherSearchProvider is added only when flag is enabled and running on
// Chrome OS.
#if defined(OS_CHROMEOS)
- if (!profile->IsGuestSession()) {
+ if (app_list::switches::IsLauncherSearchProviderApiEnabled()) {
size_t search_api_group_id =
controller->AddGroup(kMaxLauncherSearchResults, 0.0, 1.0);
controller->AddProvider(
diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml
index 214fcde..90bb14f 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -59451,7 +59451,6 @@ To add a new entry, add it with any value and run test to compute valid value.
<int value="-1725507605" label="enable-web-midi"/>
<int value="-1719833926" label="disable-answers-in-suggest"/>
<int value="-1716654100" label="tab-capture-downscale-quality"/>
- <int value="-1714128884" label="disable-launcher-search-provider-api"/>
<int value="-1703709912" label="enable-new-ntp"/>
<int value="-1703308540" label="disable-webaudio"/>
<int value="-1696366449" label="disable-permissions-bubbles"/>
@@ -59801,7 +59800,6 @@ To add a new entry, add it with any value and run test to compute valid value.
<int value="1495341532" label="disable-mtp-write-support"/>
<int value="1497924954" label="js-flags"/>
<int value="1505194447" label="disable-transition-compositing"/>
- <int value="1509901380" label="disable-drive-search-in-app-launcher"/>
<int value="1510476448" label="disable-prefixed-encrypted-media"/>
<int value="1515196403" label="fast-user-switching"/>
<int value="1560188739" label="reader-mode-heuristics"/>
diff --git a/ui/app_list/app_list_switches.cc b/ui/app_list/app_list_switches.cc
index c7cace8..7a40c0f 100644
--- a/ui/app_list/app_list_switches.cc
+++ b/ui/app_list/app_list_switches.cc
@@ -33,13 +33,9 @@ const char kDisableExperimentalAppList[] = "disable-experimental-app-list";
const char kEnableSyncAppList[] = "enable-sync-app-list";
const char kDisableSyncAppList[] = "disable-sync-app-list";
-// Disable drive search in app launcher.
-const char kDisableDriveSearchInAppLauncher[] =
- "disable-drive-search-in-app-launcher";
-
-// Disable launcher search provider API.
-const char kDisableLauncherSearchProviderApi[] =
- "disable-launcher-search-provider-api";
+// Enables launcher search provider api.
+const char kEnableLauncherSearchProviderApi[] =
+ "enable-launcher-search-provider-api";
// Enable/disable the new "blended" algorithm in app_list::Mixer. This is just
// forcing the AppListMixer/Blended field trial.
@@ -114,19 +110,10 @@ bool IsDriveAppsInAppListEnabled() {
#endif
}
-bool IsDriveSearchEnabled() {
-#if defined(OS_CHROMEOS)
- return !base::CommandLine::ForCurrentProcess()->HasSwitch(
- kDisableDriveSearchInAppLauncher);
-#else
- return false;
-#endif
-}
-
bool IsLauncherSearchProviderApiEnabled() {
#if defined(OS_CHROMEOS)
- return !base::CommandLine::ForCurrentProcess()->HasSwitch(
- kDisableLauncherSearchProviderApi);
+ return base::CommandLine::ForCurrentProcess()->HasSwitch(
+ kEnableLauncherSearchProviderApi);
#else
return false;
#endif
diff --git a/ui/app_list/app_list_switches.h b/ui/app_list/app_list_switches.h
index e5070db..2899e9ab 100644
--- a/ui/app_list/app_list_switches.h
+++ b/ui/app_list/app_list_switches.h
@@ -22,8 +22,7 @@ APP_LIST_EXPORT extern const char kEnableNewAppListMixer[];
APP_LIST_EXPORT extern const char kDisableNewAppListMixer[];
APP_LIST_EXPORT extern const char kEnableSyncAppList[];
APP_LIST_EXPORT extern const char kDisableSyncAppList[];
-APP_LIST_EXPORT extern const char kDisableDriveSearchInAppLauncher[];
-APP_LIST_EXPORT extern const char kDisableLauncherSearchProviderApi[];
+APP_LIST_EXPORT extern const char kEnableLauncherSearchProviderApi[];
#if defined(OS_MACOSX)
APP_LIST_EXPORT extern const char kEnableMacViewsAppList[];
@@ -48,8 +47,6 @@ bool APP_LIST_EXPORT ShouldNotDismissOnBlur();
bool APP_LIST_EXPORT IsDriveAppsInAppListEnabled();
-bool APP_LIST_EXPORT IsDriveSearchEnabled();
-
bool APP_LIST_EXPORT IsLauncherSearchProviderApiEnabled();
#if defined(OS_MACOSX)
generated by cgit v1.1 at 2025-02-19 11:58:44 +0000