Issue 1268 - Correctly mimic Chrome's behavior when opening the options page

background.js

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2014 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 265 matching lines @@
   else
     notifyUser();
 }
 
 Prefs.addListener(function(name)
 {
   if (name == "shouldShowBlockElementMenu")
     refreshIconAndContextMenuForAllPages();
 });
 
-/**
-  * Opens options page or focuses an existing one, within the last focused window.
-  * @param {Function} callback  function to be called with the
-                                Page object of the options page
-  */
-function openOptions(callback)
-{
-  ext.pages.query({lastFocusedWindow: true}, function(pages)
-  {
-    var optionsUrl = ext.getURL("options.html");
-
-    for (var i = 0; i < pages.length; i++)
-    {
-      var page = pages[i];
-      if (page.url == optionsUrl)
-      {
-        page.activate();
-        if (callback)
-          callback(page);
-        return;
-      }
-    }
-
-    ext.pages.open(optionsUrl, callback);
-  });
-}
-
 function prepareNotificationIconAndPopup()
 {
   var animateIcon = (activeNotification.type !== "question");
   activeNotification.onClicked = function()
   {
     if (animateIcon)
       iconAnimation.stop();
     notificationClosed();
   };
   if (animateIcon)
@@ skipping 248 matching lines @@
       }
       break;
     case "add-filters":
       if (msg.filters && msg.filters.length)
       {
         for (var i = 0; i < msg.filters.length; i++)
           FilterStorage.addFilter(Filter.fromText(msg.filters[i]));
       }
       break;
     case "add-subscription":
-      openOptions(function(page)
+      ext.showOptions(function(page)
       {
         page.sendMessage(msg);
       });
       break;
     case "add-key-exception":
       processKeyException(msg.token, sender.page, sender.frame);
       break;
     case "forward":
       if (sender.page)
       {
@@ skipping 15 matching lines @@
   page.sendMessage({type: "clickhide-deactivate"});
   refreshIconAndContextMenu(page);
 });
 
 setTimeout(function()
 {
   var notificationToShow = Notification.getNextToShow();
   if (notificationToShow)
     showNotification(notificationToShow);
 }, 3 * 60 * 1000);