Issue 4680 - Use runtime.openOptionsPage when available

chrome/ext/background.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2016 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 594 matching lines @@
     },
     remove: function(key, callback)
     {
       chrome.storage.local.remove(key, callback);
     },
     onChanged: chrome.storage.onChanged
   };
 
   /* Options */
 
-  ext.showOptions = function(callback)
+  if ("openOptionsPage" in chrome.runtime)
   {
-    chrome.windows.getLastFocused(function(win)
+    ext.showOptions = chrome.runtime.openOptionsPage;

[Sebastian Noack, 2016/12/08 15:26:42]

I wonder how/whether this can work? The old code (now used as fallback) calls
the callback with a Page object, plus it waits until the page has finished
loading. I suppose you only tested the scenario when opening the options page
from the popup menu, in which case the callback isn't used.

[kzar, 2016/12/09 09:11:02]

Damn you're right. Sorry I'll open a review to fix that regression now.

+  }
+  else
+  {
+    // Edge does not yet support runtime.openOptionsPage (tested version 38)
+    // and so this workaround needs to stay for now.
+    ext.showOptions = function(callback)
     {
-      var optionsUrl = chrome.extension.getURL("options.html");
-      var queryInfo = {url: optionsUrl};
+      chrome.windows.getLastFocused(function(win)
+      {
+        var optionsUrl = chrome.extension.getURL("options.html");
+        var queryInfo = {url: optionsUrl};
 
-      // extension pages can't be accessed in incognito windows. In order to
-      // correctly mimic the way in which Chrome opens extension options,
-      // we have to focus the options page in any other window.
-      if (!win.incognito)
-        queryInfo.windowId = win.id;
+        // extension pages can't be accessed in incognito windows. In order to
+        // correctly mimic the way in which Chrome opens extension options,
+        // we have to focus the options page in any other window.
+        if (!win.incognito)
+          queryInfo.windowId = win.id;
 
-      chrome.tabs.query(queryInfo, function(tabs)
-      {
-        if (tabs.length > 0)
+        chrome.tabs.query(queryInfo, function(tabs)
         {
-          var tab = tabs[0];
+          if (tabs.length > 0)
+          {
+            var tab = tabs[0];
 
-          chrome.windows.update(tab.windowId, {focused: true});
-          chrome.tabs.update(tab.id, {active: true});
+            chrome.windows.update(tab.windowId, {focused: true});
+            chrome.tabs.update(tab.id, {active: true});
 
-          if (callback)
-            callback(new Page(tab));
-        }
-        else
-        {
-          ext.pages.open(optionsUrl, callback);
-        }
+            if (callback)
+              callback(new Page(tab));
+          }
+          else
+          {
+            ext.pages.open(optionsUrl, callback);
+          }
+        });
       });
-    });
-  };
+    };
+  }
 
   /* Windows */
   ext.windows = {
     create: function(createData, callback)
     {
       chrome.windows.create(createData, function(createdWindow)
       {
         afterTabLoaded(callback)(createdWindow.tabs[0]);
       });
     }
   };
 })();