Backout of bad partial patch
authorMark Finkle <mfinkle@mozilla.com>
Thu, 10 Dec 2009 17:25:05 -0500
changeset 65902 fc11fc20b5f8c3b8adac28d8cd7f11df73f6ed3d
parent 65901 060c00af8353c26372b4dd7fe88c3abfd6b2508a
child 65903 69d3a216938a0523e0c4ecec655fdcd2040011ab
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
Backout of bad partial patch
mobile/components/BrowserCLH.js
--- a/mobile/components/BrowserCLH.js
+++ b/mobile/components/BrowserCLH.js
@@ -56,31 +56,27 @@ BrowserCLH.prototype = {
     // the cache during install, not runtime.
     // NOTE: This code assumes this CLH is run before the nsDefaultCLH, which
     // consumes the "-silent" flag.
     if (cmdLine.findFlag("silent", false) > -1) {
       let searchService = Cc["@mozilla.org/browser/search-service;1"].
                           getService(Ci.nsIBrowserSearchService);
     }
 
-    if (cmdLine.state == Ci.nsICommandLine.STATE_INITIAL_LAUNCH)
-      return;
-
-    cmdLine.preventDefault = true;
-
     let win;
     try {
       var windowMediator =
         Cc["@mozilla.org/appshell/window-mediator;1"].getService(Ci.nsIWindowMediator);
 
       win = windowMediator.getMostRecentWindow("navigator:browser");
       if (!win)
         return;
 
       win.focus();
+      cmdLine.preventDefault = true;
     } catch (e) { }
 
     // Assumption:  All CLH arguments we've received have been sent remotely,
     // or we wouldn't already have a window.  Therefore: open 'em all!
     for (let i = 0; i < cmdLine.length; i++) {
       let arg = cmdLine.getArgument(i);
       if (!arg || arg[0] == '-')
         continue;