Merge pull request #2162 from mozilla/issue_1023_window_name

Give the Persona window the name __persona_dialog when opening. 

Thanks @lloyd, I removed the unused paths.

close #1023

resources/static/include_js/include.js

@@ -626,6 +626,8 @@
   })();
 
   // local embedded copy of winchan: http://github.com/lloyd/winchan
+  // BEGIN WINCHAN
+
   ;WinChan = (function() {
     var RELAY_FRAME_NAME = "__winchan_relay_frame";
     var CLOSE_CMD = "die";
@@ -723,6 +725,7 @@
           if (err) setTimeout(function() { cb(err); }, 0);
 
           // supply default options
+          if (!opts.window_name) opts.window_name = null;
           if (!opts.window_features || isFennec()) opts.window_features = undefined;
 
           // opts.params may be undefined
@@ -752,7 +755,7 @@
             messageTarget = iframe.contentWindow;
           }
 
-          var w = window.open(opts.url, null, opts.window_features);
+          var w = window.open(opts.url, opts.window_name, opts.window_features);
 
           if (!messageTarget) messageTarget = w;
 
@@ -822,6 +825,10 @@
     }
   })();
 
+
+
+  // END WINCHAN
+
   var BrowserSupport = (function() {
     var win = window,
         nav = navigator,
@@ -1112,6 +1119,7 @@
         url: ipServer + '/sign_in',
         relay_url: ipServer + '/relay',
         window_features: windowOpenOpts,
+        window_name: '__persona_dialog',
         params: {
           method: "get",
           params: options