Skip to content

Commit

Permalink
Merge pull request #171 from devoncarew/devoncarew_chrome_35
Browse files Browse the repository at this point in the history
Devoncarew chrome 35
  • Loading branch information
devoncarew committed Jul 1, 2014
2 parents 8db64c6 + f7afd40 commit ca22aff
Show file tree
Hide file tree
Showing 126 changed files with 5,217 additions and 3,019 deletions.
14 changes: 14 additions & 0 deletions app/demo/demo.dart
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,11 @@ void main() {
action("getInfo()", handleAudioGetInfo);
br();

label('browser');
action('available', handleBrowserAvailable);
action('openTab()', handleBrowserOpenTab);
br();

label('bluetooth');
action('available', handleBluetoothAvailable);
action('getAdapterState()', handleBluetoothGetAdapterState);
Expand Down Expand Up @@ -475,6 +480,15 @@ void handleFileDelete() {
summaryFuture(f);
}

void handleBrowserAvailable() {
summary("available = ${chrome.browser.available}");
}

void handleBrowserOpenTab() {
summaryFuture(chrome.browser.openTab(
new chrome.OpenTabOptions(url: 'http://www.google.com')));
}

void handleBluetoothAvailable() {
summary("available = ${chrome.bluetooth.available}");
}
Expand Down
3 changes: 2 additions & 1 deletion app/demo/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

"permissions": [
"alarms",
"browser",
{ "fileSystem": ["write", "retainEntries", "directory"] },
"idle",
"identity",
Expand All @@ -25,7 +26,7 @@
{ "socket" : ["tcp-connect", "tcp-listen"] },
"tts"
],

"oauth2": {
// client_id below is specifc to the application key. Follow the
// documentation to obtain one for your app.
Expand Down
155 changes: 114 additions & 41 deletions idl/_api_features.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,20 @@

// See c/c/e/features/* to understand this file, in particular feature.h,
// simple_feature.h, and base_feature_provider.h.
//
// Note that specifying "web_page", "blessed_web_page", or "all" as a context
// type will require manually updating chrome/renderer/resources/dispatcher.cc.

{
"accessibilityFeatures": [{
"platforms": ["chromeos"],
"dependencies": ["permission:accessibilityFeatures.modify"],
"contexts": ["blessed_extension"]
}, {
"platforms": ["chromeos"],
"dependencies": ["permission:accessibilityFeatures.read"],
"contexts": ["blessed_extension"]
}],
"activityLogPrivate": {
"dependencies": ["permission:activityLogPrivate"],
"contexts": ["blessed_extension"]
Expand All @@ -22,7 +34,11 @@
"channel": "stable",
"extension_types": ["hosted_app", "extension", "legacy_packaged_app"],
"contexts": [
"blessed_extension", "unblessed_extension", "content_script", "web_page"
"blessed_extension",
"unblessed_extension",
"content_script",
"web_page",
"blessed_web_page"
],
"matches": [
"http://*/*", "https://*/*", "chrome-extension://*/*", "file://*/*"
Expand All @@ -46,9 +62,9 @@
"channel": "stable",
"contexts": ["blessed_extension", "unblessed_extension", "content_script"]
},
"app.currentWindowInternal.setAlwaysOnTop": {
"channel": "dev",
"contexts": ["blessed_extension", "unblessed_extension", "content_script"]
"app.currentWindowInternal.setShape": {
"dependencies": ["permission:app.window.shape"],
"contexts": ["blessed_extension"]
},
"app.getDetails": {
"contexts": ["blessed_extension", "unblessed_extension", "content_script"],
Expand All @@ -74,12 +90,21 @@
"dependencies": ["permission:audio"],
"contexts": ["blessed_extension"]
},
"automationInternal": {
"internal": true,
"dependencies": ["permission:automation"],
"contexts": ["blessed_extension"]
},
"automation": {
"dependencies": ["permission:automation"],
"contexts": ["blessed_extension"]
},
"autotestPrivate": {
"dependencies": ["permission:autotestPrivate"],
"contexts": ["blessed_extension"]
},
"bluetooth": {
"dependencies": ["permission:bluetooth"],
"dependencies": ["manifest:bluetooth"],
"contexts": ["blessed_extension"]
},
"bookmarkManagerPrivate": {
Expand Down Expand Up @@ -134,6 +159,18 @@
"dependencies": ["permission:cast"],
"contexts": ["blessed_extension"]
},
"cast.streaming.rtpStream": {
"dependencies": ["permission:cast.streaming"],
"contexts": ["blessed_extension"]
},
"cast.streaming.session": {
"dependencies": ["permission:cast.streaming"],
"contexts": ["blessed_extension"]
},
"cast.streaming.udpTransport": {
"dependencies": ["permission:cast.streaming"],
"contexts": ["blessed_extension"]
},
"chromeosInfoPrivate": {
"platforms": ["chromeos"],
"dependencies": ["permission:chromeosInfoPrivate"],
Expand All @@ -159,6 +196,11 @@
"dependencies": ["permission:contextMenus"],
"contexts": ["blessed_extension"]
},
"contextMenusInternal": {
"internal": true,
"channel": "stable",
"contexts": ["blessed_extension"]
},
"cookies": {
"dependencies": ["permission:cookies"],
"contexts": ["blessed_extension"]
Expand Down Expand Up @@ -231,9 +273,7 @@
"internal": true,
"channel": "stable",
"extension_types": ["platform_app", "extension"],
"contexts": [
"blessed_extension", "unblessed_extension", "content_script", "web_page"
],
"contexts": "all",
"matches": ["<all_urls>"]
},
"experimental.accessibility": {
Expand All @@ -250,18 +290,6 @@
"extension_types": ["platform_app"],
"contexts": ["blessed_extension"]
},
"experimental.discovery": {
"dependencies": ["permission:experimental"],
"contexts": ["blessed_extension"]
},
"experimental.history": {
"dependencies": ["permission:history", "permission:experimental"],
"contexts": ["blessed_extension"]
},
"experimental.identity": {
"dependencies": ["permission:experimental"],
"contexts": ["blessed_extension"]
},
"extension": {
"channel": "stable",
"extension_types": ["extension", "legacy_packaged_app"],
Expand All @@ -270,6 +298,22 @@
"extension.getURL": {
"contexts": ["blessed_extension", "unblessed_extension", "content_script"]
},
"extension.getViews": [
{
"channel": "stable",
"contexts": ["blessed_extension"],
"extension_types": ["extension", "legacy_packaged_app"]
},
{
// TODO(yoz): Eliminate this usage.
"channel": "stable",
"contexts": ["blessed_extension"],
"extension_types": ["platform_app"],
"whitelist": [
"A948368FC53BE437A55FEB414106E207925482F5" // File manager
]
}
],
"extension.inIncognitoContext": {
"contexts": ["blessed_extension", "unblessed_extension", "content_script"]
},
Expand Down Expand Up @@ -300,6 +344,12 @@
"channel": "stable",
"contexts": ["blessed_extension", "unblessed_extension", "content_script"]
},
"screenlockPrivate": {
"platforms": ["chromeos"],
"dependencies": ["permission:screenlockPrivate"],
"extension_types": ["platform_app"],
"contexts": ["blessed_extension", "unblessed_extension"]
},
"fileBrowserPrivate": {
"platforms": ["chromeos"],
"dependencies": ["permission:fileBrowserPrivate"],
Expand All @@ -309,10 +359,23 @@
"dependencies": ["permission:fileSystem"],
"contexts": ["blessed_extension"]
},
"fileSystemProvider": {
"dependencies": ["permission:fileSystemProvider"],
"contexts": ["blessed_extension"]
},
"firstRunPrivate": {
"platforms": ["chromeos"],
"dependencies": ["permission:firstRunPrivate"],
"contexts": ["blessed_extension"]
},
"fontSettings": {
"dependencies": ["permission:fontSettings"],
"contexts": ["blessed_extension"]
},
"gcm": {
"dependencies": ["permission:gcm"],
"contexts": ["blessed_extension"]
},
"hangoutsPrivate": {
"channel": "stable",
"contexts": ["blessed_extension"],
Expand All @@ -324,10 +387,18 @@
"eggnbpckecmjlblplehfpjjdhhidfdoj"
]
},
"hid": {
"dependencies": ["permission:hid"],
"contexts": ["blessed_extension"]
},
"history": {
"dependencies": ["permission:history"],
"contexts": ["blessed_extension"]
},
"hotwordPrivate": {
"dependencies": ["permission:hotwordPrivate"],
"contexts": ["blessed_extension"]
},
"i18n": {
"channel": "stable",
"extension_types": ["extension", "legacy_packaged_app", "platform_app"],
Expand All @@ -337,11 +408,6 @@
"dependencies": ["permission:identity"],
"contexts": ["blessed_extension"]
},
"identity.onSignInChanged": {
"channel": "dev",
"dependencies": ["permission:identity"],
"contexts": ["blessed_extension"]
},
"identityPrivate": {
"dependencies": ["permission:identityPrivate"],
"contexts": ["blessed_extension"]
Expand Down Expand Up @@ -402,6 +468,11 @@
"dependencies": ["permission:mediaGalleries"],
"contexts": ["blessed_extension"]
},
"mediaGalleries.getMetadata": {
"channel": "dev",
"dependencies": ["permission:mediaGalleries"],
"contexts": ["blessed_extension"]
},
"mediaGalleriesPrivate": {
"dependencies": ["permission:mediaGalleriesPrivate"],
"contexts": ["blessed_extension"]
Expand All @@ -424,7 +495,7 @@
"contexts": ["blessed_extension"]
},
"networkingPrivate": {
"platforms": ["chromeos"],
"platforms": ["chromeos", "mac", "win"],
"dependencies": ["permission:networkingPrivate"],
"contexts": ["blessed_extension"]
},
Expand All @@ -451,8 +522,7 @@
"permissions": {
"channel": "stable",
"extension_types": ["extension", "legacy_packaged_app", "platform_app"],
"contexts": "all",
"matches": ["<all_urls>"]
"contexts": ["blessed_extension"]
},
"power": {
"dependencies": ["permission:power"],
Expand Down Expand Up @@ -487,6 +557,10 @@
"extension_types": ["platform_app"],
"contexts": ["blessed_extension"]
},
"readingListPrivate": {
"dependencies": ["permission:readingListPrivate"],
"contexts": ["blessed_extension"]
},
"rtcPrivate": {
"dependencies": ["permission:rtcPrivate"],
"contexts": ["blessed_extension"]
Expand All @@ -511,6 +585,7 @@
},
"runtime.lastError": {
"contexts": "all",
"extension_types": "all",
"matches": ["<all_urls>"]
},
"runtime.onConnect": {
Expand All @@ -529,7 +604,7 @@
"contexts": "all",
"matches": ["<all_urls>"]
},
"runtime.setUninstallUrl": {
"runtime.setUninstallURL": {
"channel": "dev",
"contexts": ["blessed_extension", "unblessed_extension", "content_script"]
},
Expand All @@ -555,17 +630,14 @@
},
"sockets.tcp": {
"dependencies": ["manifest:sockets"],
"channel": "dev",
"contexts": ["blessed_extension"]
},
"sockets.tcpServer": {
"dependencies": ["manifest:sockets"],
"channel": "dev",
"contexts": ["blessed_extension"]
},
"sockets.udp": {
"dependencies": ["manifest:sockets"],
"channel": "dev",
"contexts": ["blessed_extension"]
},
"storage": {
Expand Down Expand Up @@ -596,6 +668,10 @@
"dependencies": ["permission:system.memory"],
"contexts": ["blessed_extension"]
},
"system.network": {
"dependencies": ["permission:system.network"],
"contexts": ["blessed_extension"]
},
"system.storage": {
"dependencies": ["permission:system.storage"],
"contexts": ["blessed_extension"]
Expand All @@ -622,6 +698,7 @@
"contexts": ["blessed_extension"]
},
"test": {
"internal": true,
"channel": "stable",
"extension_types": "all",
"contexts": ["blessed_extension", "unblessed_extension", "content_script"]
Expand Down Expand Up @@ -692,27 +769,23 @@
// Hosted apps can use the webstore API from within a blessed context.
"channel": "stable",
"extension_types": ["hosted_app"],
"contexts": ["blessed_extension", "web_page"],
"contexts": ["blessed_web_page", "web_page"],
// Any webpage can use the webstore API.
"matches": ["http://*/*", "https://*/*"]
},
"webstorePrivate": {
"dependencies": ["permission:webstorePrivate"],
"contexts": ["blessed_extension"]
},
"webrtc.castSendTransport": {
"dependencies": ["permission:webrtc"],
"contexts": ["blessed_extension"]
},
"webrtc.castUdpTransport": {
"dependencies": ["permission:webrtc"],
"contexts": ["blessed_extension"]
},
"webview": {
"internal": true,
"dependencies": ["permission:webview"],
"contexts": ["blessed_extension", "unblessed_extension"]
},
"webViewRequest": {
"dependencies": ["permission:webview"],
"contexts": ["blessed_extension", "unblessed_extension"]
},
"webviewTag": {
"internal": true,
"channel": "stable",
Expand Down
Loading

0 comments on commit ca22aff

Please sign in to comment.