diff options
Diffstat (limited to 'chromium/chrome/common/extensions/api')
29 files changed, 337 insertions, 344 deletions
diff --git a/chromium/chrome/common/extensions/api/BUILD.gn b/chromium/chrome/common/extensions/api/BUILD.gn index 3d25c0a332e..d86054ef5e6 100644 --- a/chromium/chrome/common/extensions/api/BUILD.gn +++ b/chromium/chrome/common/extensions/api/BUILD.gn @@ -56,7 +56,6 @@ generated_json_strings("generated_api_json_strings") { "proxy.json", "tts.json", "tts_engine.json", - "webstore.json", ] if (is_chromeos) { sources += [ "file_browser_handler.json" ] diff --git a/chromium/chrome/common/extensions/api/PRESUBMIT.py b/chromium/chrome/common/extensions/api/PRESUBMIT.py index 71ed9c83bf3..851496e1f4f 100644 --- a/chromium/chrome/common/extensions/api/PRESUBMIT.py +++ b/chromium/chrome/common/extensions/api/PRESUBMIT.py @@ -26,6 +26,7 @@ def _CheckExterns(input_api, output_api): externs_root = join(src_root, 'third_party', 'closure_compiler', 'externs') api_pair_names = { + 'activity_log_private.json': 'activity_log_private.js', 'autofill_private.idl': 'autofill_private.js', 'automation.idl': 'automation.js', 'developer_private.idl': 'developer_private.js', diff --git a/chromium/chrome/common/extensions/api/_api_features.json b/chromium/chrome/common/extensions/api/_api_features.json index 87da3c0dd86..c6534cccb18 100644 --- a/chromium/chrome/common/extensions/api/_api_features.json +++ b/chromium/chrome/common/extensions/api/_api_features.json @@ -61,10 +61,16 @@ "dependencies": ["manifest:action"], "contexts": ["blessed_extension"] }, - "activityLogPrivate": { + "activityLogPrivate": [{ "dependencies": ["permission:activityLogPrivate"], "contexts": ["blessed_extension"] - }, + }, { + "channel": "stable", + "contexts": ["webui"], + "matches": [ + "chrome://extensions/*" + ] + }], "app": { "blacklist": [ "2FC374607C2DF285634B67C64A2E356C607091C3", // Quickoffice @@ -137,7 +143,7 @@ "contexts": ["webui"], "matches": [ "chrome://bookmarks/*", - "chrome://welcome/email" + "chrome://welcome/*" ] }], "bookmarks.export": [{ @@ -251,6 +257,7 @@ "contexts": ["webui"], "matches": [ "chrome://chrome-signin/*", + "chrome://discards/*", "chrome://media-router/*", "chrome://mobilesetup/*", "chrome://oobe/*", @@ -462,11 +469,6 @@ "dependencies": ["permission:fileBrowserHandler"], "contexts": ["blessed_extension"] }, - "screenlockPrivate": { - "dependencies": ["permission:screenlockPrivate"], - "extension_types": ["platform_app"], - "contexts": ["blessed_extension"] - }, "fileManagerPrivate": { "dependencies": ["permission:fileManagerPrivate"], "contexts": ["blessed_extension"] @@ -524,10 +526,6 @@ "dependencies": ["permission:idltest"], "contexts": ["blessed_extension"] }, - "inlineInstallPrivate": { - "dependencies": ["permission:inlineInstallPrivate"], - "contexts": ["blessed_extension"] - }, "input.ime": { "dependencies": ["permission:input"], "contexts": ["blessed_extension"] @@ -796,10 +794,6 @@ // given the blessed_extension denomination. Confusing. "contexts": ["blessed_extension"] }, - "webstoreWidgetPrivate": { - "dependencies": ["permission:webstoreWidgetPrivate"], - "contexts": ["blessed_extension"] - }, "webviewTag": { "internal": true, "channel": "stable", diff --git a/chromium/chrome/common/extensions/api/_permission_features.json b/chromium/chrome/common/extensions/api/_permission_features.json index 4e41d76e845..58cc1ad7814 100644 --- a/chromium/chrome/common/extensions/api/_permission_features.json +++ b/chromium/chrome/common/extensions/api/_permission_features.json @@ -325,7 +325,8 @@ "031E5E4A54C39E4F46E11CE643584E9187915908", // https://crbug.com/882461 SecureConnect "349E89FE0296161007623C0B4096B617D7CECD54", // https://crbug.com/882461 SecureConnect "18B761AA5B58FA89E596EB7996B4C92C86775C7F", // https://crbug.com/882461 SecureConnect - "2012C0122892D332325339998251D1CC3CAE396A" // https://crbug.com/882461 SecureConnect + "2012C0122892D332325339998251D1CC3CAE396A", // https://crbug.com/882461 SecureConnect + "86C81CACF5E2273044C491F1949E928E25F28E0A" // https://crbug.com/922140 Cloud Reporting ] }, "experimental": { @@ -461,7 +462,18 @@ }, "webcamPrivate": { "channel": "stable", - "extension_types": ["extension", "platform_app"] + "extension_types": ["extension", "platform_app"], + "whitelist": [ + "E703483CEF33DEC18B4B6DD84B5C776FB9182BDB", // http://crbug.com/891460 + "A3BC37E2148AC4E99BE4B16AF9D42DD1E592BBBE", // http://crbug.com/891460 + "1C93BD3CF875F4A73C0B2A163BB8FBDA8B8B3D80", // http://crbug.com/891460 + "307E96539209F95A1A8740C713E6998A73657D96", // http://crbug.com/891460 + "4F25792AF1AA7483936DE29C07806F203C7170A0", // http://crbug.com/891460 + "BD8781D757D830FC2E85470A1B6E8A718B7EE0D9", // http://crbug.com/891460 + "4AC2B6C63C6480D150DFDA13E4A5956EB1D0DDBB", // http://crbug.com/891460 + "81986D4F846CEDDDB962643FA501D1780DD441BB", // http://crbug.com/891460 + "A9A9FC0228ADF541F0334F22BEFB8F9C245B21D7" // http://crbug.com/891460 + ] }, "networking.castPrivate": { "channel": "stable", @@ -651,15 +663,6 @@ "0136FCB13DB29FD5CD442F56E59E53B61F1DF96F" // http://crbug.com/642141 ] }, - "inlineInstallPrivate": { - "channel": "dev", - "extension_types": ["platform_app"], - "whitelist": [ - "8076E9E4DA0DF53B33BFAF0454D3C3B898F93273", // Test Extension - "3A78E13285C1949EF84AA85E3BF65D1E83A3D9AB", // Test Extension - "4477F0B4FE934D0A8C88922C0986DA7B25D881E1" // API Test - ] - }, "resourcesPrivate": { "channel": "stable", "extension_types": [ @@ -682,15 +685,10 @@ "extension_types": ["extension"], "whitelist": [ "FD15C63ABA854733FDCBC1D4D34A71E963A12ABD", // Chrome Reporting Extension - "08455FA7CB8734168378F731B00B354CEEE0088F" // Chrome Reporting Ext. Beta + "08455FA7CB8734168378F731B00B354CEEE0088F", // Chrome Reporting Ext. Beta + "86C81CACF5E2273044C491F1949E928E25F28E0A" // https://crbug.com/922140 Cloud Reporting ] }, - "screenlockPrivate": { - "channel": "stable", - "extension_types": ["platform_app"], - "location": "component", - "platforms": ["chromeos"] - }, "sessions": { "channel": "stable", "extension_types": ["extension", "legacy_packaged_app"] @@ -863,15 +861,5 @@ "B44D08FD98F1523ED5837D78D0A606EA9D6206E5", // Web Store "2653F6F6C39BC6EEBD36A09AFB92A19782FF7EB4" // Enterprise Web Store ] - }, - "webstoreWidgetPrivate": { - "channel": "stable", - "extension_types": ["platform_app"], - "platforms": ["chromeos"], - "whitelist": [ - "A948368FC53BE437A55FEB414106E207925482F5", // Files app - "8C726564C6DBE7380BAB388DE6CC7EC93EB44B06", // Video player - "5065C83E84321221675D20FBE4DC43C655CC8C6F" // Files app tests - ] } } diff --git a/chromium/chrome/common/extensions/api/api_sources.gni b/chromium/chrome/common/extensions/api/api_sources.gni index a10fa68d904..dffbca515d6 100644 --- a/chromium/chrome/common/extensions/api/api_sources.gni +++ b/chromium/chrome/common/extensions/api/api_sources.gni @@ -44,7 +44,6 @@ schema_sources_ = [ "identity.idl", "identity_private.idl", "image_writer_private.idl", - "inline_install_private.idl", "instance_id.json", "language_settings_private.idl", "manifest_types.json", @@ -73,7 +72,6 @@ schema_sources_ = [ "webrtc_logging_private.idl", "webstore_private.json", - "webstore_widget_private.idl", "windows.json", ] @@ -107,7 +105,6 @@ if (is_chromeos) { "platform_keys.idl", "platform_keys_internal.idl", "quick_unlock_private.idl", - "screenlock_private.idl", "terminal_private.json", "users_private.idl", "wallpaper.json", diff --git a/chromium/chrome/common/extensions/api/autofill_private.idl b/chromium/chrome/common/extensions/api/autofill_private.idl index 166ea49ecb9..b41477f776f 100644 --- a/chromium/chrome/common/extensions/api/autofill_private.idl +++ b/chromium/chrome/common/extensions/api/autofill_private.idl @@ -236,6 +236,9 @@ namespace autofillPrivate { // Triggers local credit cards migration. static void migrateCreditCards(); + + // Logs that the server cards edit link was clicked. + static void logServerCardLinkClicked(); }; interface Events { diff --git a/chromium/chrome/common/extensions/api/automation.idl b/chromium/chrome/common/extensions/api/automation.idl index 299d02c67e2..0985048ecd5 100644 --- a/chromium/chrome/common/extensions/api/automation.idl +++ b/chromium/chrome/common/extensions/api/automation.idl @@ -63,6 +63,8 @@ stateChanged, textChanged, textSelectionChanged, + windowActivated, + windowDeactivated, treeChanged, valueChanged }; @@ -288,6 +290,7 @@ doDefault, focus, getImageData, + getTextLocation, hitTest, increment, loadInlineTextBoxes, @@ -486,6 +489,8 @@ // Callback called for actions with a response. callback PerformActionCallback = void(boolean result); callback PerformActionCallbackWithNode = void(AutomationNode node); + callback BoundsForRangeCallback = void(Rect bounds); + dictionary CustomAction { long id; @@ -512,11 +517,12 @@ // screen coordinates. Rect? location; - // Computes the bounding box of a subrange of this node in global screen - // coordinates. Returns the same as |location| if range information - // is not available. The start and end indices are zero-based offsets - // into the node's "name" string attribute. - static Rect boundsForRange(long startIndex, long endIndex); + // Determines the location of the text within the node specified by + // |startIndex| and |endIndex|, inclusively. Invokes |callback| with the + // bounding rectangle, in screen coordinates. |callback| can be invoked + // either synchronously or asynchronously. + static void boundsForRange(long startIndex, long endIndex, + BoundsForRangeCallback callback); // The location (as a bounding box) of this node in global screen // coordinates without applying any clipping from ancestors. diff --git a/chromium/chrome/common/extensions/api/automation_internal.idl b/chromium/chrome/common/extensions/api/automation_internal.idl index 115a045c061..ce1eb3856b8 100644 --- a/chromium/chrome/common/extensions/api/automation_internal.idl +++ b/chromium/chrome/common/extensions/api/automation_internal.idl @@ -31,6 +31,17 @@ namespace automationInternal { long actionRequestID; }; + dictionary AXTextLocationParams { + DOMString treeID; + long nodeID; + boolean result; + long left; + long top; + long width; + long height; + long requestID; + }; + // Actions internally used by automation. enum ActionTypePrivate { resumeMedia, @@ -101,6 +112,12 @@ namespace automationInternal { DOMString eventToFire; }; + // Arguments for getTextLocation action. + dictionary GetTextLocationDataParams { + long startIndex; + long endIndex; + }; + // Returns the accessibility tree id of the web contents who's accessibility // was enabled using enableTab(). callback EnableTabCallback = void(DOMString tree_id); @@ -139,6 +156,8 @@ namespace automationInternal { static void onAccessibilityTreeDestroyed(DOMString treeID); + static void onGetTextLocationResult(AXTextLocationParams params); + static void onTreeChange(long observerID, DOMString treeID, long nodeID, diff --git a/chromium/chrome/common/extensions/api/autotest_private.idl b/chromium/chrome/common/extensions/api/autotest_private.idl index 82588eeb042..d5bfd96b6b1 100644 --- a/chromium/chrome/common/extensions/api/autotest_private.idl +++ b/chromium/chrome/common/extensions/api/autotest_private.idl @@ -222,5 +222,9 @@ namespace autotestPrivate { // daemon startup, and 2. the initial D-Bus -> Mojo IPC bootstrap. // |callback|: Called when the operation has completed. static void bootstrapMachineLearningService(VoidCallback callback); + + // Enable/disable the Google Assistant + // |callback|: Called when the operation has completed. + static void setAssistantEnabled(boolean enabled, long timeout_ms, VoidCallback callback); }; }; diff --git a/chromium/chrome/common/extensions/api/braille_display_private.idl b/chromium/chrome/common/extensions/api/braille_display_private.idl index 08b7317ccc1..7e5a8956ede 100644 --- a/chromium/chrome/common/extensions/api/braille_display_private.idl +++ b/chromium/chrome/common/extensions/api/braille_display_private.idl @@ -74,6 +74,10 @@ namespace brailleDisplayPrivate { // parameters give the original 2D dimensions of the buffer. To access // an element cells[r][c], simply access cells[r * columns + c]. static void writeDots(ArrayBuffer cells, long columns, long rows); + + // Updates the single user-preferred braille device with the given bluetooth + // device address and starts or restarts the Brltty daemon. + static void updateBluetoothBrailleDisplayAddress(DOMString address); }; interface Events { diff --git a/chromium/chrome/common/extensions/api/browsing_data.json b/chromium/chrome/common/extensions/api/browsing_data.json index 10fd0b7156b..3e62daaa63f 100644 --- a/chromium/chrome/common/extensions/api/browsing_data.json +++ b/chromium/chrome/common/extensions/api/browsing_data.json @@ -54,7 +54,12 @@ "cache": { "type": "boolean", "optional": true, - "description": "The browser's cache. Note: when removing data, this clears the <em>entire</em> cache: it is not limited to the range you specify." + "description": "The browser's cache." + }, + "cacheStorage": { + "type": "boolean", + "optional": true, + "description": "Cache storage" }, "cookies": { "type": "boolean", @@ -210,6 +215,24 @@ ] }, { + "name": "removeCacheStorage", + "description": "Clears websites' cache storage data.", + "type": "function", + "parameters": [ + { + "$ref": "RemovalOptions", + "name": "options" + }, + { + "name": "callback", + "type": "function", + "description": "Called when websites' cache storage has been cleared.", + "optional": true, + "parameters": [] + } + ] + }, + { "name": "removeCookies", "description": "Clears the browser's cookies and server-bound certificates modified within a particular timeframe.", "type": "function", @@ -372,6 +395,24 @@ ] }, { + "name": "removeServiceWorkers", + "description": "Clears websites' service workers.", + "type": "function", + "parameters": [ + { + "$ref": "RemovalOptions", + "name": "options" + }, + { + "name": "callback", + "type": "function", + "description": "Called when websites' service workers have been cleared.", + "optional": true, + "parameters": [] + } + ] + }, + { "name": "removeWebSQL", "description": "Clears websites' WebSQL data.", "type": "function", diff --git a/chromium/chrome/common/extensions/api/cryptotoken_private.idl b/chromium/chrome/common/extensions/api/cryptotoken_private.idl index 99c2e3f67a8..e2e8571ad4b 100644 --- a/chromium/chrome/common/extensions/api/cryptotoken_private.idl +++ b/chromium/chrome/common/extensions/api/cryptotoken_private.idl @@ -10,8 +10,7 @@ // the FIDO spec</a></p> namespace cryptotokenPrivate { - // Callback for appId check - callback AppIdCallback = void(boolean result); + callback BooleanCallback = void(boolean result); dictionary CanAppIdGetAttestationOptions { // The AppId (see definition, above) that was used in the registration @@ -33,7 +32,7 @@ namespace cryptotokenPrivate { // is the appId being asserted by the origin. static void canOriginAssertAppId(DOMString securityOrigin, DOMString appIdUrl, - AppIdCallback callback); + BooleanCallback callback); // Checks whether the given appId is specified in the // SecurityKeyPermitAttestation policy. This causes a signal to be sent to @@ -41,13 +40,16 @@ namespace cryptotokenPrivate { // certificate may be used. Without that signal, the token is required to // use its batch attestation certificate. static void isAppIdHashInEnterpriseContext(ArrayBuffer appIdHash, - AppIdCallback callback); + BooleanCallback callback); // Checks whether the given appId may receive attestation data that // identifies the token. If not, the attestation from the token must be // substituted with a randomly generated certificate since webauthn and U2F // require that some attestation be provided. static void canAppIdGetAttestation(CanAppIdGetAttestationOptions options, - AppIdCallback callback); + BooleanCallback callback); + + // Checks whether Cryptotoken can proxy the request through to WebAuthn. + static void canProxyToWebAuthn(BooleanCallback callback); }; }; diff --git a/chromium/chrome/common/extensions/api/developer_private.idl b/chromium/chrome/common/extensions/api/developer_private.idl index a63582e2b2b..2cd288d662b 100644 --- a/chromium/chrome/common/extensions/api/developer_private.idl +++ b/chromium/chrome/common/extensions/api/developer_private.idl @@ -201,10 +201,13 @@ namespace developerPrivate { boolean granted; }; - dictionary SpecificSiteControls { + dictionary RuntimeHostPermissions { // True if |hosts| contains an all hosts like pattern. boolean hasAllHosts; + // The current HostAccess setting for the extension. + HostAccess hostAccess; + // The site controls for all granted and requested patterns. SiteControl[] hosts; }; @@ -213,12 +216,8 @@ namespace developerPrivate { Permission[] simplePermissions; // Only populated for extensions that can be affected by the runtime host - // permissions feature.The current host access. - HostAccess? hostAccess; - - // Only populated for extensions affected by the runtime host - // permissions feature and |hostAccess| is equal to ON_SPECIFIC_SITES. - SpecificSiteControls? specificSiteControls; + // permissions feature. + RuntimeHostPermissions? runtimeHostPermissions; }; dictionary ExtensionInfo { diff --git a/chromium/chrome/common/extensions/api/file_manager_private.idl b/chromium/chrome/common/extensions/api/file_manager_private.idl index f0f8029b8db..34e7980f03a 100644 --- a/chromium/chrome/common/extensions/api/file_manager_private.idl +++ b/chromium/chrome/common/extensions/api/file_manager_private.idl @@ -184,7 +184,10 @@ enum EntryPropertyName { canDelete, canRename, canAddChildren, - canShare + canShare, + isMachineRoot, + isExternalMedia, + isArbitrarySyncFolder }; // Entry property visibility for setEntryTag(); @@ -222,6 +225,8 @@ enum SourceRestriction { native_or_drive_source }; +enum CrostiniSharedPathsChangedEventType { share, unshare }; + // A file task represents an action that the file manager can perform over the // currently selected files. See // chrome/browser/chromeos/extensions/file_manager/file_tasks.h for details @@ -335,6 +340,16 @@ dictionary EntryProperties { // True if the entry can be shared by the user. boolean? canShare; + + // True if the entry is a machine root for backup and sync. + boolean? isMachineRoot; + + // True if the entry is a external media folder, that contains one time only + // uploads for USB devices, SD cards etc. + boolean? isExternalMedia; + + // True if the entry is an arbitrary sync folder. + boolean? isArbitrarySyncFolder; }; // Information about total and remaining size on the mount point. @@ -536,7 +551,6 @@ dictionary FileWatchEvent { dictionary Preferences { boolean driveEnabled; boolean cellularDisabled; - boolean hostedFilesDisabled; boolean searchSuggestEnabled; boolean use24hourClock; boolean allowRedeemOffers; @@ -545,7 +559,6 @@ dictionary Preferences { dictionary PreferencesChange { boolean? cellularDisabled; - boolean? hostedFilesDisabled; }; dictionary SearchParams { @@ -629,6 +642,26 @@ dictionary Provider { manifestTypes.FileSystemProviderSource source; }; +// Information about a Linux package in response to GetLinuxPackageInfo. +dictionary LinuxPackageInfo { + DOMString name; + DOMString version; + + // A one-line summary of the project. Almost always present. + DOMString? summary; + // A longer description of the project. Almost always present. + DOMString? description; +}; + +// Payload data for crostini shared paths changed event. +dictionary CrostiniSharedPathsChangedEvent { + // Is the event raised for shared or unshared. + CrostiniSharedPathsChangedEventType eventType; + + // Paths that have been shared or unshared. + [instanceOf=Entry] object[] entries; +}; + // Callback that does not take arguments. callback SimpleCallback = void(); @@ -737,8 +770,13 @@ callback GetDirectorySizeCallback = void(double size); callback GetRecentFilesCallback = void([instanceOf=Entry] object[] entries); // |entries| Entries shared with crostini container. +// |firstForSession| true the first time this is called for the session. callback GetCrostiniSharedPathsCallback = - void([instanceOf = Entry] object[] entries); + void([instanceOf = Entry] object[] entries, boolean firstForSession); + +// |linux_package_info| Package info for the queried package. +callback GetLinuxPackageInfoCallback = + void(LinuxPackageInfo linux_package_info); // |status| Result of starting the install // |failure_reason| Reason for failure for a 'failed' status @@ -1116,16 +1154,22 @@ interface Functions { static void mountCrostini(SimpleCallback callback); // Shares directory with crostini container. - // |entry| Entry of the directory to share. + // |entries| Entries of the files or directories to share. + // |persist| If true, shares will persist across restarts. // |callback| [nocompile] - static void sharePathWithCrostini( - [instanceof=DirectoryEntry] object entry, SimpleCallback callback); + static void sharePathsWithCrostini( + [instanceof=Entry] object[] entries, boolean persist, SimpleCallback callback); // Returns list of paths shared with crostini container. [nocompile] static void getCrostiniSharedPaths(GetCrostiniSharedPathsCallback callback); + // Requests information about a Linux package. |entry| is a .deb file. + [nocompile] + static void getLinuxPackageInfo([instanceof=Entry] object entry, + GetLinuxPackageInfoCallback callback); + // Starts installation of a Linux package. [nocompile] static void installLinuxPackage([instanceof=Entry] object entry, @@ -1167,5 +1211,8 @@ interface Events { static void onDriveSyncError(DriveSyncErrorEvent event); static void onAppsUpdated(); + + static void onCrostiniSharedPathsChanged( + CrostiniSharedPathsChangedEvent event); }; }; diff --git a/chromium/chrome/common/extensions/api/file_manager_private_internal.idl b/chromium/chrome/common/extensions/api/file_manager_private_internal.idl index 51236b33938..b089677a371 100644 --- a/chromium/chrome/common/extensions/api/file_manager_private_internal.idl +++ b/chromium/chrome/common/extensions/api/file_manager_private_internal.idl @@ -32,7 +32,10 @@ namespace fileManagerPrivateInternal { callback ValidatePathNameLengthCallback = void(boolean result); callback GetDirectorySizeCallback = void(double size); callback GetRecentFilesCallback = void(EntryDescription[] entries); - callback GetCrostiniSharedPathsCallback = void(EntryDescription[] entries); + callback GetCrostiniSharedPathsCallback = + void(EntryDescription[] entries, boolean firstForSession); + callback GetLinuxPackageInfoCallback = + void(fileManagerPrivate.LinuxPackageInfo linux_package_info); callback InstallLinuxPackageCallback = void(fileManagerPrivate.InstallLinuxPackageResponse response, optional DOMString failure_reason); @@ -101,10 +104,12 @@ namespace fileManagerPrivateInternal { GetDirectorySizeCallback callback); static void getRecentFiles(fileManagerPrivate.SourceRestriction restriction, GetRecentFilesCallback callback); - static void sharePathWithCrostini(DOMString url, - SimpleCallback callback); + static void sharePathsWithCrostini(DOMString[] urls, boolean persist, + SimpleCallback callback); static void getCrostiniSharedPaths( GetCrostiniSharedPathsCallback callback); + static void getLinuxPackageInfo(DOMString url, + GetLinuxPackageInfoCallback callback); static void installLinuxPackage(DOMString url, InstallLinuxPackageCallback callback); static void getThumbnail(DOMString url, diff --git a/chromium/chrome/common/extensions/api/inline_install_private.idl b/chromium/chrome/common/extensions/api/inline_install_private.idl deleted file mode 100644 index 70af8c0947f..00000000000 --- a/chromium/chrome/common/extensions/api/inline_install_private.idl +++ /dev/null @@ -1,18 +0,0 @@ -// Copyright 2014 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Private API to initiate inline install flow of other apps. -namespace inlineInstallPrivate { - - // This returns a developer-readable error message in error and - // a string error code in errorCode (see $ref:webstore.ErrorCode) - callback ResultCallback = void (DOMString error, - DOMString errorCode); - - interface Functions { - // This can currently only be used to install apps, but not extensions. - static void install(DOMString id, - optional ResultCallback callback); - }; -}; diff --git a/chromium/chrome/common/extensions/api/input_method_private.json b/chromium/chrome/common/extensions/api/input_method_private.json index af49d28da7f..fbef854400c 100644 --- a/chromium/chrome/common/extensions/api/input_method_private.json +++ b/chromium/chrome/common/extensions/api/input_method_private.json @@ -63,7 +63,8 @@ "autoCapitalize": {"$ref": "AutoCapitalizeType", "description": "The auto-capitalize type of the text field."}, "spellCheck": {"type": "boolean", "description": "Whether the text field wants spell-check."}, "shouldDoLearning": {"type": "boolean", "description": "Whether text entered into the text field should be used to improve typing suggestions for the user."}, - "focusReason": {"$ref": "FocusReason", "description": "How the text field was focused"} + "focusReason": {"$ref": "FocusReason", "description": "How the text field was focused"}, + "hasBeenPassword": {"type": "boolean", "description": "Whether the text field has ever been a password field."} } } ], @@ -335,6 +336,62 @@ ] } ] + }, { + "name": "getSetting", + "type": "function", + "description": "Gets the current value of a setting for a particular input method", + "parameters": [ + { + "name": "engineID", + "type": "string", + "description": "The ID of the engine (e.g. 'zh-t-i0-pinyin', 'xkb:us::eng')" + }, + { + "name": "key", + "type": "string", + "description": "The setting to get" + }, + { + "type": "function", + "name": "callback", + "description": "Callback to receive the setting", + "parameters": [ + { + "name": "setting", + "type": "any", + "optional": true, + "description": "The value for the requested setting, or null if there's no value" + } + ] + } + ] + }, { + "name": "setSetting", + "type": "function", + "description": "Sets the value of a setting for a particular input method", + "parameters": [ + { + "name": "engineID", + "type": "string", + "description": "The ID of the engine (e.g. 'zh-t-i0-pinyin', 'xkb:us::eng')" + }, + { + "name": "key", + "type": "string", + "description": "The setting to set" + }, + { + "name": "value", + "type": "any", + "description": "The new value of the setting" + }, + { + "type": "function", + "name": "callback", + "description": "Callback to notify that the new value has been set", + "parameters": [] + } + ] } ], "events": [ diff --git a/chromium/chrome/common/extensions/api/language_settings_private.idl b/chromium/chrome/common/extensions/api/language_settings_private.idl index 3a30cb0406b..e0492c4a21f 100644 --- a/chromium/chrome/common/extensions/api/language_settings_private.idl +++ b/chromium/chrome/common/extensions/api/language_settings_private.idl @@ -33,8 +33,8 @@ namespace languageSettingsPrivate { boolean? supportsTranslate; // Whether this language is prohibited as a UI locale (not in the list of - // the 'AllowedUILocales' policy). Defaults to false. - boolean? isProhibitedUILocale; + // the 'AllowedLanguages' policy). Defaults to false. + boolean? isProhibitedLanguage; }; dictionary SpellcheckDictionaryStatus { diff --git a/chromium/chrome/common/extensions/api/networking_cast_private.idl b/chromium/chrome/common/extensions/api/networking_cast_private.idl index cc4335cdba3..c4b45a3a732 100644 --- a/chromium/chrome/common/extensions/api/networking_cast_private.idl +++ b/chromium/chrome/common/extensions/api/networking_cast_private.idl @@ -67,17 +67,6 @@ static void verifyDestination(VerificationProperties properties, BooleanCallback callback); - // Verifies that the device is a trusted device and retrieves encrypted - // network credentials. - // |properties|: Properties of the destination to use in verifying that it - // is a trusted device. - // |networkGuid|: The GUID of the Cellular network to activate. - // |callback|: A callback function that receives base64-encoded encrypted - // credential data to send to a trusted device. - static void verifyAndEncryptCredentials(VerificationProperties properties, - DOMString networkGuid, - StringCallback callback); - // Verifies that the device is a trusted device and encrypts supplied // data with device public key. // |properties|: Properties of the destination to use in verifying that it diff --git a/chromium/chrome/common/extensions/api/passwords_private.idl b/chromium/chrome/common/extensions/api/passwords_private.idl index 32c7fd71523..716d95a658f 100644 --- a/chromium/chrome/common/extensions/api/passwords_private.idl +++ b/chromium/chrome/common/extensions/api/passwords_private.idl @@ -50,13 +50,13 @@ namespace passwordsPrivate { DOMString? federationText; // An index to refer back to a unique password entry record. - long index; + long id; }; // Dictionary passed to listeners for the onPlaintextPasswordRetrieved event. dictionary PlaintextPasswordEventParameters { - // An index to refer back to a unique password entry record. - long index; + // An id to refer back to a unique password entry record. + long id; // The password in plaintext. DOMString plaintextPassword; @@ -65,8 +65,8 @@ namespace passwordsPrivate { dictionary ExceptionEntry { UrlCollection urls; - // An index to refer back to a unique exception entry record. - long index; + // An id to refer back to a unique exception entry record. + long id; }; dictionary PasswordExportProgress { @@ -84,29 +84,33 @@ namespace passwordsPrivate { callback EmptyCallback = void(); interface Functions { + // Function that logs that the Passwords page was accessed from the Chrome + // Settings WebUI. + static void recordPasswordsPageAccessInSettings(); + // Removes the saved password corresponding to |loginPair|. If no saved // password for this pair exists, this function is a no-op. // - // |index|: The index for the password entry being removed. - static void removeSavedPassword(long index); + // |id|: The id for the password entry being removed. + static void removeSavedPassword(long id); // Removes the saved password exception corresponding to |exceptionUrl|. If // no exception with this URL exists, this function is a no-op. // - // |index|: The index for the exception url entry being removed. - static void removePasswordException(long index); + // |id|: The id for the exception url entry being removed. + static void removePasswordException(long id); // Undoes the last removal of a saved password or exception. static void undoRemoveSavedPasswordOrException(); - // Returns the plaintext password corresponding to |index|. Note that on + // Returns the plaintext password corresponding to |id|. Note that on // some operating systems, this call may result in an OS-level // reauthentication. Once the password has been fetched, it will be returned // via the onPlaintextPasswordRetrieved event. // TODO(hcarmona): Investigate using a callback for consistency. // - // |index|: The index for the password entry being being retrieved. - static void requestPlaintextPassword(long index); + // |id|: The id for the password entry being being retrieved. + static void requestPlaintextPassword(long id); // Returns the list of saved passwords. // |callback|: Called with the list of saved passwords. @@ -154,8 +158,7 @@ namespace passwordsPrivate { // Fired when a plaintext password has been fetched in response to a call to // chrome.passwordsPrivate.requestPlaintextPassword(). // - // |index|: The index for the password entry being being retrieved. - // |plaintextPassword|: The plaintext password which was retrieved. + // |dict|: Contains the plaintext password and id of the relevant entry. static void onPlaintextPasswordRetrieved( PlaintextPasswordEventParameters dict); diff --git a/chromium/chrome/common/extensions/api/permissions.json b/chromium/chrome/common/extensions/api/permissions.json index a504746024e..4ba169a8c1f 100644 --- a/chromium/chrome/common/extensions/api/permissions.json +++ b/chromium/chrome/common/extensions/api/permissions.json @@ -15,13 +15,13 @@ "type": "array", "items": {"type": "string"}, "optional": true, - "description": "List of named permissions (does not include hosts or origins). Anything listed here must appear in the <code>optional_permissions</code> list in the manifest." + "description": "List of named permissions (does not include hosts or origins)." }, "origins": { "type": "array", "items": {"type": "string"}, "optional": true, - "description": "List of origin permissions. Anything listed here must be a subset of a host that appears in the <code>optional_permissions</code> list in the manifest. For example, if <code>http://*.example.com/</code> or <code>http://*/</code> appears in <code>optional_permissions</code>, you can request an origin of <code>http://help.example.com/</code>. Any path is ignored." + "description": "The list of host permissions, including those specified in the <code>optional_permissions</code> or <code>permissions</code> keys in the manifest, and those associated with <a href='content_scripts'>Content Scripts</a>." } } } @@ -65,7 +65,7 @@ { "name": "permissions", "$ref": "Permissions", - "description": "The extension's active permissions." + "description": "The extension's active permissions. Note that the <code>origins</code> property will contain granted origins from those specified in the <code>permissions</code> and <code>optional_permissions</code> keys in the manifest and those associated with <a href='content_scripts'>Content Scripts</a>." } ] } @@ -87,7 +87,7 @@ { "name": "result", "type": "boolean", - "description": "True if the extension has the specified permissions." + "description": "True if the extension has the specified permissions. If an origin is specified as both an optional permission and a content script match pattern, this will return <code>false</code> unless both permissions are granted." } ] } @@ -96,7 +96,7 @@ { "name": "request", "type": "function", - "description": "Requests access to the specified permissions. These permissions must be defined in the optional_permissions field of the manifest. If there are any problems requesting the permissions, $(ref:runtime.lastError) will be set.", + "description": "Requests access to the specified permissions, displaying a prompt to the user if necessary. These permissions must either be defined in the <code>optional_permissions</code> field of the manifest or be required permissions that were withheld by the user. Paths on origin patterns will be ignored. You can request subsets of optional origin permissions; for example, if you specify <code>*://*/*</code> in the <code>optional_permissions</code> section of the manifest, you can request <code>http://example.com/</code>. If there are any problems requesting the permissions, $(ref:runtime.lastError) will be set.", "parameters": [ { "name": "permissions", diff --git a/chromium/chrome/common/extensions/api/screenlock_private.idl b/chromium/chrome/common/extensions/api/screenlock_private.idl deleted file mode 100644 index 9af2160f813..00000000000 --- a/chromium/chrome/common/extensions/api/screenlock_private.idl +++ /dev/null @@ -1,43 +0,0 @@ -// Copyright 2013 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Control and monitor the screen locker. -[permissions=screenlockPrivate, nodoc] -namespace screenlockPrivate { - // Supported authentication types shown on the user pod. - // |offlinePassword|: The standard password field, which authenticates using - // the user's regular password. The $(ref:onAuthAttempted)() - // event will not be fired for this authentication type. - // |numericPin|: An input field for a 4 digit numeric pin code. - // |userClick|: Makes the user pod clickable when it is focused, and - // clicking on it attempts the authentication. If |value| is - // specified with $(ref:setAuthType)(), the text is displayed - // in the password field. - enum AuthType {offlinePassword, numericPin, userClick}; - - callback BooleanCallback = void(boolean locked); - - interface Functions { - // Returns true if the screen is currently locked, false otherwise. - static void getLocked(BooleanCallback callback); - - // Set <code>locked=true</code> to lock the screen, - // <code>locked=false</code> to unlock it. - static void setLocked(boolean locked); - - // Accepts or rejects the current auth attempt. - static void acceptAuthAttempt(boolean accept); - }; - - interface Events { - // Fires whenever the screen is locked or unlocked. - static void onChanged(boolean locked); - - // Fires when the user attempts to authenticate with the user's input. - // There will be at most one auth attempt active at any time. - // Call $(ref:acceptAuthAttempt)() to accept or reject this attempt. - // Note: Some authentication types will not have an input. - static void onAuthAttempted(AuthType type, DOMString input); - }; -}; diff --git a/chromium/chrome/common/extensions/api/tabs.json b/chromium/chrome/common/extensions/api/tabs.json index 158b4b7e8e1..6314f19906c 100644 --- a/chromium/chrome/common/extensions/api/tabs.json +++ b/chromium/chrome/common/extensions/api/tabs.json @@ -946,6 +946,46 @@ ] } ] + }, + { + "name": "goForward", + "type": "function", + "description": "Go foward to the next page, if one is available.", + "parameters": [ + { + "type": "integer", + "name": "tabId", + "optional": true, + "minimum": 0, + "description": "The ID of the tab to navigate forward; defaults to the selected tab of the current window." + }, + { + "type": "function", + "name": "callback", + "optional": true, + "parameters": [] + } + ] + }, + { + "name": "goBack", + "type": "function", + "description": "Go back to the previous page, if one is available.", + "parameters": [ + { + "type": "integer", + "name": "tabId", + "optional": true, + "minimum": 0, + "description": "The ID of the tab to navigate back; defaults to the selected tab of the current window." + }, + { + "type": "function", + "name": "callback", + "optional": true, + "parameters": [] + } + ] } ], "events": [ diff --git a/chromium/chrome/common/extensions/api/url_handlers/url_handlers_parser.cc b/chromium/chrome/common/extensions/api/url_handlers/url_handlers_parser.cc index 701ec1b88c7..c0e28835a0f 100644 --- a/chromium/chrome/common/extensions/api/url_handlers/url_handlers_parser.cc +++ b/chromium/chrome/common/extensions/api/url_handlers/url_handlers_parser.cc @@ -109,7 +109,8 @@ UrlHandlersParser::~UrlHandlersParser() { bool ParseUrlHandler(const std::string& handler_id, const base::DictionaryValue& handler_info, std::vector<UrlHandlerInfo>* url_handlers, - base::string16* error) { + base::string16* error, + Extension* extension) { DCHECK(error); UrlHandlerInfo handler; @@ -134,8 +135,14 @@ bool ParseUrlHandler(const std::string& handler_id, // TODO(sergeygs): Limit this to non-top-level domains. // TODO(sergeygs): Also add a verification to the CWS installer that the // URL patterns claimed here belong to the app's author verified sites. - URLPattern pattern(URLPattern::SCHEME_HTTP | - URLPattern::SCHEME_HTTPS); + URLPattern pattern(URLPattern::SCHEME_HTTP | URLPattern::SCHEME_HTTPS); + // System Web Apps are bookmark apps that point to chrome:// URLs. + // TODO(calamity): Remove once Bookmark Apps are no longer on Extensions. + if (extension->location() == Manifest::EXTERNAL_COMPONENT && + extension->from_bookmark()) { + pattern = URLPattern(URLPattern::SCHEME_CHROMEUI); + } + if (pattern.Parse(str_pattern) != URLPattern::ParseResult::kSuccess) { *error = ErrorUtils::FormatErrorMessageUTF16( merrors::kInvalidURLHandlerPatternElement, handler_id); @@ -174,7 +181,8 @@ bool UrlHandlersParser::Parse(Extension* extension, base::string16* error) { return false; } - if (!ParseUrlHandler(iter.key(), *handler, &info->handlers, error)) { + if (!ParseUrlHandler(iter.key(), *handler, &info->handlers, error, + extension)) { // Text in |error| is set by ParseUrlHandler. return false; } diff --git a/chromium/chrome/common/extensions/api/webrtc_logging_private.idl b/chromium/chrome/common/extensions/api/webrtc_logging_private.idl index 108460d6eb7..bbcc05501f6 100644 --- a/chromium/chrome/common/extensions/api/webrtc_logging_private.idl +++ b/chromium/chrome/common/extensions/api/webrtc_logging_private.idl @@ -162,13 +162,18 @@ namespace webrtcLoggingPrivate { // Start remote-bound event logging for a specific peer connection, // indicated by its ID, for which remote-bound event logging was not active. // If successful, the callback will carry the ID of the log. - // |webAppId| must be a number between 1 and 99 (inclusive), which will be - // incorporated into the uploaded log, so as to help distinugish logs - // captured by different web-apps. + // * |webAppId| must be a number between 1 and 99 (inclusive), which will be + // incorporated into the uploaded log, so as to help distinugish logs + // captured by different web-apps. + // * |outputPeriodMs| refers to the time between emissions of logs. + // Only non-negative values are allowed. If set to zero, logs will be + // produced as soon as an event occurs. If positive, events will be + // batched together and emitted approximately every |outputPeriodMs| ms. static void startEventLogging(RequestInfo request, DOMString securityOrigin, DOMString peerConnectionId, long maxLogSizeBytes, + long outputPeriodMs, long webAppId, StartEventLoggingCallback callback); diff --git a/chromium/chrome/common/extensions/api/webstore.json b/chromium/chrome/common/extensions/api/webstore.json index df5dde78a7f..1194ab63daa 100644 --- a/chromium/chrome/common/extensions/api/webstore.json +++ b/chromium/chrome/common/extensions/api/webstore.json @@ -11,7 +11,8 @@ "id": "InstallStage", "type": "string", "enum": ["installing", "downloading"], - "description": "Enum used to indicate the stage of the installation process. 'downloading' indicates that the necessary files are being downloaded, and 'installing' indicates that the files are downloaded and are being actively installed." + "description": "Enum used to indicate the stage of the installation process. 'downloading' indicates that the necessary files are being downloaded, and 'installing' indicates that the files are downloaded and are being actively installed.", + "deprecated": "Inline installation is deprecated." }, { "id": "ErrorCode", @@ -89,7 +90,8 @@ "description": "A launch of the same extension is in progress.", "name": "launchInProgress" } - ] + ], + "deprecated": "Inline installation is deprecated." } ], // types "events": [ @@ -103,7 +105,8 @@ "$ref": "InstallStage", "description": "The InstallStage that just began." } - ] + ], + "deprecated": "Inline installation is deprecated." }, // onInstallStageChanged { "name": "onDownloadProgress", @@ -115,7 +118,8 @@ "type": "number", "description": "The progress of the download, between 0 and 1. 0 indicates no progress; 1.0 indicates complete." } - ] + ], + "deprecated": "Inline installation is deprecated." } // onDownloadProgress ], // events "functions": [ @@ -155,7 +159,8 @@ ], "description": "This function is invoked when inline installation does not successfully complete. Possible reasons for this include the user canceling the dialog, the linked item not being found in the store, or the install being initiated from a non-verified site." } - ] + ], + "deprecated": "Inline installation is deprecated." } // install ] // functions } // webstore diff --git a/chromium/chrome/common/extensions/api/webstore/webstore_api_constants.cc b/chromium/chrome/common/extensions/api/webstore/webstore_api_constants.cc deleted file mode 100644 index 09b0b76d187..00000000000 --- a/chromium/chrome/common/extensions/api/webstore/webstore_api_constants.cc +++ /dev/null @@ -1,60 +0,0 @@ -// Copyright 2014 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "chrome/common/extensions/api/webstore/webstore_api_constants.h" - -#include "base/macros.h" -#include "chrome/common/extensions/webstore_install_result.h" - -namespace extensions { -namespace api { -namespace webstore { - -// IMPORTANT: Keep this list in sync with both the definition in -// chrome/common/extensions/api/webstore.json and -// chrome/common/extensions/webstore_install_result.h! -const char* const kInstallResultCodes[] = { - "success", - "otherError", - "aborted", - "installInProgress", - "notPermitted", - "invalidId", - "webstoreRequestError", - "invalidWebstoreResponse", - "invalidManifest", - "iconError", - "userCancelled", - "blacklisted", - "missingDependencies", - "requirementViolations", - "blockedByPolicy", - "launchFeatureDisabled", - "launchUnsupportedExtensionType", - "launchInProgress", -}; - -static_assert(arraysize(kInstallResultCodes) == - webstore_install::RESULT_LAST + 1, - "kInstallResultCodes should equal RESULT_LAST + 1"); - -// The "downloading" stage begins when the installer starts downloading modules -// for the extension. -const char kInstallStageDownloading[] = "downloading"; - -// The "installing" stage begins once all downloads are complete, and the -// CrxInstaller begins. -const char kInstallStageInstalling[] = "installing"; - -// The method in custom_webstore_bindings.js triggered when we enter a new -// install stage ("downloading" or "installing"). -const char kOnInstallStageChangedMethodName[] = "onInstallStageChanged"; - -// The method in custom_webstore_bindings.js triggered when we update -// download progress. -const char kOnDownloadProgressMethodName[] = "onDownloadProgress"; - -} // namespace webstore -} // namespace api -} // namespace extensions diff --git a/chromium/chrome/common/extensions/api/webstore/webstore_api_constants.h b/chromium/chrome/common/extensions/api/webstore/webstore_api_constants.h deleted file mode 100644 index 8a6b4909f98..00000000000 --- a/chromium/chrome/common/extensions/api/webstore/webstore_api_constants.h +++ /dev/null @@ -1,40 +0,0 @@ -// Copyright 2014 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_COMMON_EXTENSIONS_API_WEBSTORE_WEBSTORE_API_CONSTANTS_H_ -#define CHROME_COMMON_EXTENSIONS_API_WEBSTORE_WEBSTORE_API_CONSTANTS_H_ - -namespace extensions { -namespace api { -namespace webstore { - -// An enum for listener types. This is used when creating/reading the mask for -// IPC messages. -enum ListenerType { - INSTALL_STAGE_LISTENER = 1, - DOWNLOAD_PROGRESS_LISTENER = 1 << 1 -}; - -// An enum to represent which stage the installation is in. -enum InstallStage { - INSTALL_STAGE_DOWNLOADING = 0, - INSTALL_STAGE_INSTALLING, -}; - -// Result codes returned by WebstoreStandaloneInstaller and its subclasses. -// IMPORTANT: Keep this list in sync with both the definition in -// chrome/common/extensions/api/webstore.json and -// chrome/common/extensions/webstore_install_result.h! -extern const char* const kInstallResultCodes[]; - -extern const char kInstallStageDownloading[]; -extern const char kInstallStageInstalling[]; -extern const char kOnInstallStageChangedMethodName[]; -extern const char kOnDownloadProgressMethodName[]; - -} // namespace webstore -} // namespace api -} // namespace extensions - -#endif // CHROME_COMMON_EXTENSIONS_API_WEBSTORE_WEBSTORE_API_CONSTANTS_H_ diff --git a/chromium/chrome/common/extensions/api/webstore_widget_private.idl b/chromium/chrome/common/extensions/api/webstore_widget_private.idl deleted file mode 100644 index 362f37c50fe..00000000000 --- a/chromium/chrome/common/extensions/api/webstore_widget_private.idl +++ /dev/null @@ -1,62 +0,0 @@ -// Copyright 2015 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// webstoreWidgetPrivate API. -// This is a private API used by the Chrome Webstore widget app on Chrome OS. -[platforms=("chromeos")] -namespace webstoreWidgetPrivate { -// The type of apps that should be shown in the Webstore widget. -enum Type { - // Type that should be used to list printer provider apps. For this type, - // options passed to |onShowWidget| should have |usbId| property set. - PRINTER_PROVIDER -}; - -// ID for a USB device. -dictionary UsbId { - // The USB device's vendor ID property. - long vendorId; - - // The USB device's product ID property. - long productId; -}; - -// Filter for apps that will be shown in the Webstore widget. -dictionary Options { - // The type of apps that should be shown. - Type type; - - // If set, only apps that have printerProvider permission and usbDevices - // permission for USB device with the provided (vendor ID, product ID) pair. - // Required if |type| is set to |PRINTER_PROVIDER|. - UsbId? usbId; -}; - -// |result| Object containing the string assets. -callback GetStringsCallback = void(object result); - -// Callback that does not take arguments. -callback SimpleCallback = void(); - -interface Functions { - // Gets localized strings and initialization data. - static void getStrings(GetStringsCallback callback); - - // Requests to install a webstore item. - // |item_id| The id of the item to install. - // |silentInstallation| False to show installation prompt. True not to show. - // Can be set to true only for a subset of installation requests. - static void installWebstoreItem(DOMString itemId, - boolean silentInstallation, - SimpleCallback callback); -}; - -interface Events { - // Event dispatched when a Chrome Webstore widget is requested to be shown. - // |options|: Options describing the set of apps that should be shown in the - // widget. - static void onShowWidget(Options options); -}; - -}; |