Merge pull request #2458 from brave/registerProtocolHandler

Implement navigator.registerProtocolHandler
brave · Jul 12, 2016 · c0ff347 · c0ff347
2 parents 91a78ae + 6bb36ef
commit c0ff347
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 0 deletions.
diff --git a/app/extensions/brave/locales/en-US/app.properties b/app/extensions/brave/locales/en-US/app.properties
@@ -138,6 +138,7 @@ permissionWebMidi=use web MIDI
 permissionDisableCursor=disable your mouse cursor
 permissionFullscreen=use fullscreen mode
 permissionExternal=open an external application
+permissionProtocolRegistration=register a protocol handler
 tabsSuggestionTitle=Tabs
 bookmarksSuggestionTitle=Bookmarks
 historySuggestionTitle=History

diff --git a/app/extensions/brave/locales/en-US/preferences.properties b/app/extensions/brave/locales/en-US/preferences.properties
@@ -86,6 +86,7 @@ midiSysexPermission=Use web MIDI
 pointerLockPermission=Disable your mouse cursor
 fullscreenPermission=Fullscreen access
 openExternalPermission=Open external applications
+protocolRegistrationPermission=Protocol registration
 flash=Run Adobe Flash Player
 flashAllowOnce=Allow once
 flashAllowAlways=Allow until {{time}}

diff --git a/app/filtering.js b/app/filtering.js
@@ -270,6 +270,9 @@ function registerPermissionHandler (session, partition) {
         },
         openExternal: {
           action: locale.translation('permissionExternal')
+        },
+        protocolRegistration: {
+          action: locale.translation('permissionProtocolRegistration')
         }
       }
     }

diff --git a/app/locale.js b/app/locale.js
@@ -156,6 +156,7 @@ var rendererIdentifiers = function () {
     'permissionDisableCursor',
     'permissionFullscreen',
     'permissionExternal',
+    'permissionProtocolRegistration',
     'tabsSuggestionTitle',
     'bookmarksSuggestionTitle',
     'historySuggestionTitle',

diff --git a/docs/state.md b/docs/state.md
@@ -40,6 +40,7 @@ AppStore
       pointerLockPermission: boolean,
       fullscreenPermission: boolean,
       openExternalPermission: boolean,
+      protocolRegistrationPermission: boolean,
       savePasswords: boolean, // Only false or undefined/null
       shieldsUp: boolean,
       adControl: string, // (showBraveAds | blockAds | allowAdsAndTracking)

diff --git a/js/about/preferences.js b/js/about/preferences.js
@@ -43,6 +43,7 @@ const permissionNames = {
   'pointerLockPermission': 'boolean',
   'fullscreenPermission': 'boolean',
   'openExternalPermission': 'boolean',
+  'protocolRegistrationPermission': 'boolean',
   'flash': 'number'
 }