Merge pull request #912 from maksimr/master

Changed deprecated chrome.extension on chrome.runtime [Chromium v29] (fixed #908)

8 files changed, 32 insertions, 34 deletions

diff --git a/background_scripts/main.coffee b/background_scripts/main.coffee
index c585c265..f564f477 100644
--- a/background_scripts/main.coffee
+++ b/background_scripts/main.coffee
@@ -33,7 +33,7 @@ completers =
   bookmarks: new MultiCompleter([completionSources.bookmarks])
   tabs: new MultiCompleter([completionSources.tabs])
 
-chrome.extension.onConnect.addListener((port, name) ->
+chrome.runtime.onConnect.addListener((port, name) ->
   senderTabId = if port.sender.tab then port.sender.tab.id else null
   # If this is a tab we've been waiting to open, execute any "tab loaded" handlers, e.g. to restore
   # the tab's scroll position. Wait until domReady before doing this; otherwise operations like restoring
@@ -54,7 +54,7 @@ chrome.extension.onConnect.addListener((port, name) ->
     port.onMessage.addListener(portHandlers[port.name])
 )
 
-chrome.extension.onMessage.addListener((request, sender, sendResponse) ->
+chrome.runtime.onMessage.addListener((request, sender, sendResponse) ->
   if (sendRequestHandlers[request.handler])
     sendResponse(sendRequestHandlers[request.handler](request, sender))
   # Ensure the sendResponse callback is freed.
@@ -138,7 +138,7 @@ helpDialogHtmlForCommandGroup = (group, commandsToKey, availableCommands,
 #
 fetchFileContents = (extensionFileName) ->
   req = new XMLHttpRequest()
-  req.open("GET", chrome.extension.getURL(extensionFileName), false) # false => synchronous
+  req.open("GET", chrome.runtime.getURL(extensionFileName), false) # false => synchronous
   req.send()
   req.responseText
 
@@ -528,7 +528,7 @@ shouldShowUpgradeMessage = ->
 
 openOptionsPageInNewTab = ->
   chrome.tabs.getSelected(null, (tab) ->
-    chrome.tabs.create({ url: chrome.extension.getURL("pages/options.html"), index: tab.index + 1 }))
+    chrome.tabs.create({ url: chrome.runtime.getURL("pages/options.html"), index: tab.index + 1 }))
 
 registerFrame = (request, sender) ->
   unless framesForTab[sender.tab.id]
@@ -573,7 +573,7 @@ sendRequestHandlers =
   gotoMark: Marks.goto.bind(Marks)
 
 # Convenience function for development use.
-window.runTests = -> open(chrome.extension.getURL('tests/dom_tests/dom_tests.html'))
+window.runTests = -> open(chrome.runtime.getURL('tests/dom_tests/dom_tests.html'))
 
 #
 # Begin initialization.
diff --git a/content_scripts/link_hints.coffee b/content_scripts/link_hints.coffee
index 302acaac..f2479d0f 100644
--- a/content_scripts/link_hints.coffee
+++ b/content_scripts/link_hints.coffee
@@ -91,12 +91,12 @@ LinkHints =
     else if @mode is COPY_LINK_URL
       HUD.show("Copy link URL to Clipboard")
       @linkActivator = (link) ->
-        chrome.extension.sendMessage({handler: "copyToClipboard", data: link.href})
+        chrome.runtime.sendMessage({handler: "copyToClipboard", data: link.href})
     else if @mode is OPEN_INCOGNITO
       HUD.show("Open link in incognito window")
 
       @linkActivator = (link) ->
-        chrome.extension.sendMessage(
+        chrome.runtime.sendMessage(
           handler: 'openUrlInIncognito'
           url: link.href)
     else # OPEN_IN_CURRENT_TAB
diff --git a/content_scripts/marks.coffee b/content_scripts/marks.coffee
index 91701936..316ab951 100644
--- a/content_scripts/marks.coffee
+++ b/content_scripts/marks.coffee
@@ -6,7 +6,7 @@ root.activateCreateMode = ->
     return unless keyChar isnt ""
 
     if /[A-Z]/.test keyChar
-      chrome.extension.sendMessage {
+      chrome.runtime.sendMessage {
         handler: 'createMark',
         markName: keyChar
         scrollX: window.scrollX,
@@ -29,7 +29,7 @@ root.activateGotoMode = ->
     return unless keyChar isnt ""
 
     if /[A-Z]/.test keyChar
-      chrome.extension.sendMessage
+      chrome.runtime.sendMessage
         handler: 'gotoMark'
         markName: keyChar
     else if /[a-z]/.test keyChar
diff --git a/content_scripts/vimium_frontend.coffee b/content_scripts/vimium_frontend.coffee
index dcc46bb6..a2139df6 100644
--- a/content_scripts/vimium_frontend.coffee
+++ b/content_scripts/vimium_frontend.coffee
@@ -49,7 +49,7 @@ settings =
   eventListeners: {}
 
   init: ->
-    @port = chrome.extension.connect({ name: "settings" })
+    @port = chrome.runtime.connect({ name: "settings" })
     @port.onMessage.addListener(@receiveMessage)
 
   get: (key) -> @values[key]
@@ -103,7 +103,7 @@ initializePreDomReady = ->
   refreshCompletionKeys()
 
   # Send the key to the key handler in the background page.
-  keyPort = chrome.extension.connect({ name: "keyDown" })
+  keyPort = chrome.runtime.connect({ name: "keyDown" })
 
   requestHandlers =
     hideUpgradeNotification: -> HUD.hideUpgradeNotification()
@@ -118,7 +118,7 @@ initializePreDomReady = ->
     getActiveState: -> { enabled: isEnabledForUrl }
     disableVimium: disableVimium
 
-  chrome.extension.onMessage.addListener (request, sender, sendResponse) ->
+  chrome.runtime.onMessage.addListener (request, sender, sendResponse) ->
     # in the options page, we will receive requests from both content and background scripts. ignore those
     # from the former.
     return if sender.tab and not sender.tab.url.startsWith 'chrome-extension://'
@@ -158,7 +158,7 @@ disableVimium = ->
 window.addEventListener "focus", ->
   # settings may have changed since the frame last had focus
   settings.load()
-  chrome.extension.sendMessage({ handler: "frameFocused", frameId: frameId })
+  chrome.runtime.sendMessage({ handler: "frameFocused", frameId: frameId })
 
 #
 # Initialization tasks that must wait for the document to be ready.
@@ -169,12 +169,12 @@ initializeOnDomReady = ->
   enterInsertModeIfElementIsFocused() if isEnabledForUrl
 
   # Tell the background page we're in the dom ready state.
-  chrome.extension.connect({ name: "domReady" })
+  chrome.runtime.connect({ name: "domReady" })
 
 # This is a little hacky but sometimes the size wasn't available on domReady?
 registerFrameIfSizeAvailable = (is_top) ->
   if (innerWidth != undefined && innerWidth != 0 && innerHeight != undefined && innerHeight != 0)
-    chrome.extension.sendMessage(
+    chrome.runtime.sendMessage(
       handler: "registerFrame"
       frameId: frameId
       area: innerWidth * innerHeight
@@ -250,19 +250,19 @@ extend window,
     window.location.href = window.location.origin
 
   toggleViewSource: ->
-    chrome.extension.sendMessage { handler: "getCurrentTabUrl" }, (url) ->
+    chrome.runtime.sendMessage { handler: "getCurrentTabUrl" }, (url) ->
       if (url.substr(0, 12) == "view-source:")
         url = url.substr(12, url.length - 12)
       else
         url = "view-source:" + url
-      chrome.extension.sendMessage({ handler: "openUrlInNewTab", url: url, selected: true })
+      chrome.runtime.sendMessage({ handler: "openUrlInNewTab", url: url, selected: true })
 
   copyCurrentUrl: ->
     # TODO(ilya): When the following bug is fixed, revisit this approach of sending back to the background
     # page to copy.
     # http://code.google.com/p/chromium/issues/detail?id=55188
-    chrome.extension.sendMessage { handler: "getCurrentTabUrl" }, (url) ->
-      chrome.extension.sendMessage { handler: "copyToClipboard", data: url }
+    chrome.runtime.sendMessage { handler: "getCurrentTabUrl" }, (url) ->
+      chrome.runtime.sendMessage { handler: "copyToClipboard", data: url }
 
     HUD.showForDuration("Yanked URL", 1000)
 
@@ -438,7 +438,7 @@ onKeyup = (event) -> return unless handlerStack.bubbleEvent('keyup', event)
 checkIfEnabledForUrl = ->
   url = window.location.toString()
 
-  chrome.extension.sendMessage { handler: "isEnabledForUrl", url: url }, (response) ->
+  chrome.runtime.sendMessage { handler: "isEnabledForUrl", url: url }, (response) ->
     isEnabledForUrl = response.isEnabledForUrl
     if (isEnabledForUrl)
       initializeWhenEnabled()
@@ -453,7 +453,7 @@ refreshCompletionKeys = (response) ->
     if (response.validFirstKeys)
       validFirstKeys = response.validFirstKeys
   else
-    chrome.extension.sendMessage({ handler: "getCompletionKeys" }, refreshCompletionKeys)
+    chrome.runtime.sendMessage({ handler: "getCompletionKeys" }, refreshCompletionKeys)
 
 isValidFirstKey = (keyChar) ->
   validFirstKeys[keyChar] || /[1-9]/.test(keyChar)
@@ -870,7 +870,7 @@ window.showHelpDialog = (html, fid) ->
   VimiumHelpDialog.init()
 
   container.getElementsByClassName("optionsPage")[0].addEventListener("click",
-    -> chrome.extension.sendMessage({ handler: "openOptionsPageInNewTab" })
+    -> chrome.runtime.sendMessage({ handler: "openOptionsPageInNewTab" })
     false)
 
 
@@ -927,7 +927,7 @@ HUD =
 
   onUpdateLinkClicked: (event) ->
     HUD.hideUpgradeNotification()
-    chrome.extension.sendMessage({ handler: "upgradeNotificationClosed" })
+    chrome.runtime.sendMessage({ handler: "upgradeNotificationClosed" })
 
   hideUpgradeNotification: (clickEvent) ->
     Tween.fade(HUD.upgradeNotificationElement(), 0, 150,
@@ -999,7 +999,7 @@ initializePreDomReady()
 window.addEventListener("DOMContentLoaded", initializeOnDomReady)
 
 window.onbeforeunload = ->
-  chrome.extension.sendMessage(
+  chrome.runtime.sendMessage(
     handler: "updateScrollPosition"
     scrollX: window.scrollX
     scrollY: window.scrollY)
diff --git a/content_scripts/vomnibar.coffee b/content_scripts/vomnibar.coffee
index b8c28bcb..6782ab28 100644
--- a/content_scripts/vomnibar.coffee
+++ b/content_scripts/vomnibar.coffee
@@ -115,7 +115,7 @@ class VomnibarUI
         # <Enter> on an empty vomnibar is a no-op.
         return unless 0 < query.length
         @hide()
-        chrome.extension.sendMessage({
+        chrome.runtime.sendMessage({
           handler: if openInNewTab then "openUrlInNewTab" else "openUrlInCurrentTab"
           url: query })
       else
@@ -186,9 +186,9 @@ class BackgroundCompleter
   # - name: The background page completer that you want to interface with. Either "omni", "tabs", or
   # "bookmarks". */
   constructor: (@name) ->
-    @filterPort = chrome.extension.connect({ name: "filterCompleter" })
+    @filterPort = chrome.runtime.connect({ name: "filterCompleter" })
 
-  refresh: -> chrome.extension.sendMessage({ handler: "refreshCompleter", name: @name })
+  refresh: -> chrome.runtime.sendMessage({ handler: "refreshCompleter", name: @name })
 
   filter: (query, callback) ->
     id = Utils.createUniqueId()
@@ -220,12 +220,12 @@ extend BackgroundCompleter,
         script.textContent = decodeURIComponent(url["javascript:".length..])
         (document.head || document.documentElement).appendChild script
       else
-        chrome.extension.sendMessage(
+        chrome.runtime.sendMessage(
           handler: if openInNewTab then "openUrlInNewTab" else "openUrlInCurrentTab"
           url: url,
           selected: openInNewTab)
 
-    switchToTab: (tabId) -> chrome.extension.sendMessage({ handler: "selectSpecificTab", id: tabId })
+    switchToTab: (tabId) -> chrome.runtime.sendMessage({ handler: "selectSpecificTab", id: tabId })
 
 root = exports ? window
 root.Vomnibar = Vomnibar
diff --git a/pages/popup.coffee b/pages/popup.coffee
index 0bac6ca7..6d7afafc 100644
--- a/pages/popup.coffee
+++ b/pages/popup.coffee
@@ -1,5 +1,5 @@
 onLoad = ->
-  document.getElementById("optionsLink").setAttribute "href", chrome.extension.getURL("pages/options.html")
+  document.getElementById("optionsLink").setAttribute "href", chrome.runtime.getURL("pages/options.html")
   chrome.tabs.getSelected null, (tab) ->
     # The common use case is to disable Vimium at the domain level.
     # This regexp will match "http://www.example.com/" from "http://www.example.com/path/to/page.html".
diff --git a/test_harnesses/vomnibar.html b/test_harnesses/vomnibar.html
index f9528548..f484279e 100644
--- a/test_harnesses/vomnibar.html
+++ b/test_harnesses/vomnibar.html
@@ -26,7 +26,7 @@
         onMessage: { addListener: function(callback) { } },
         postMessage: function() { }
       };
-      window.chrome.extension = {
+      window.chrome.runtime = {
         connect: function() { return port; },
         sendRequest: function() { },
       };
diff --git a/tests/dom_tests/chrome.coffee b/tests/dom_tests/chrome.coffee
index 71d0c572..7f99e27f 100644
--- a/tests/dom_tests/chrome.coffee
+++ b/tests/dom_tests/chrome.coffee
@@ -5,7 +5,7 @@
 root = exports ? window
 
 root.chrome = {
-  extension: {
+  runtime: {
     connect: -> {
       onMessage: {
         addListener: ->
@@ -16,8 +16,6 @@ root.chrome = {
       addListener: ->
     }
     sendMessage: ->
-  }
-  runtime: {
     getManifest: ->
   }
 }