summaryrefslogtreecommitdiffstats
path: root/extensions
diff options
context:
space:
mode:
authoryawano <yawano@chromium.org>2015-04-01 22:48:19 -0700
committerCommit bot <commit-bot@chromium.org>2015-04-02 05:49:11 +0000
commitaf1ed79a98694c4353c4234b2b6f994532bf8cb6 (patch)
tree9b9106425ffc50db270039a3628f47fcf26b7c14 /extensions
parent98a97e6b7da1e14206b101400bec9297ddd612be (diff)
downloadchromium_src-af1ed79a98694c4353c4234b2b6f994532bf8cb6.zip
chromium_src-af1ed79a98694c4353c4234b2b6f994532bf8cb6.tar.gz
chromium_src-af1ed79a98694c4353c4234b2b6f994532bf8cb6.tar.bz2
Initial commit for chrome.launcherSearchProvider API.
This CL includes - Define API idl. - Add permission. - Add flag. - Implement onQueryStarted event. Permission is restricted to trunk and FileManager during the development. After the implementation is completed, it will be relaxed to white-listed on stable and public on dev. BUG=440649 Review URL: https://codereview.chromium.org/1011353003 Cr-Commit-Position: refs/heads/master@{#323434}
Diffstat (limited to 'extensions')
-rw-r--r--extensions/browser/extension_function_histogram_value.h1
-rw-r--r--extensions/common/permissions/api_permission.h1
2 files changed, 2 insertions, 0 deletions
diff --git a/extensions/browser/extension_function_histogram_value.h b/extensions/browser/extension_function_histogram_value.h
index a9cff51..e37b8db 100644
--- a/extensions/browser/extension_function_histogram_value.h
+++ b/extensions/browser/extension_function_histogram_value.h
@@ -1053,6 +1053,7 @@ enum HistogramValue {
EASYUNLOCKPRIVATE_HIDEERRORBUBBLE,
WEBVIEWINTERNAL_SETZOOMMODE,
WEBVIEWINTERNAL_GETZOOMMODE,
+ LAUNCHERSEARCHPROVIDER_SETSEARCHRESULTS,
// Last entry: Add new entries above and ensure to update
// tools/metrics/histograms/histograms.xml.
ENUM_BOUNDARY
diff --git a/extensions/common/permissions/api_permission.h b/extensions/common/permissions/api_permission.h
index c07cc3d..16fff64 100644
--- a/extensions/common/permissions/api_permission.h
+++ b/extensions/common/permissions/api_permission.h
@@ -135,6 +135,7 @@ class APIPermission {
kInput,
kInputMethodPrivate,
kInterceptAllKeys,
+ kLauncherSearchProvider,
kLocation,
kLogPrivate,
kManagement,