Fix navigation bugs, patch the right file, nuke an old file.

chrome/browser/ui/browser_navigator.h

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_UI_BROWSER_NAVIGATOR_H_
 #define CHROME_BROWSER_UI_BROWSER_NAVIGATOR_H_
 #pragma once
 
 #include <string>
 
@@ skipping 62 matching lines @@
 
   // The disposition requested by the navigation source. Default is
   // CURRENT_TAB. What follows is a set of coercions that happen to this value
   // when other factors are at play:
   //
   // [in]:                Condition:                        [out]:
   // NEW_BACKGROUND_TAB   target browser tabstrip is empty  NEW_FOREGROUND_TAB
   // CURRENT_TAB          "     "     "                     NEW_FOREGROUND_TAB
   // OFF_THE_RECORD       target browser profile is incog.  NEW_FOREGROUND_TAB
   //
-  // If disposition is NEW_WINDOW or NEW_POPUP, |show_window| is set to true
-  // automatically.
   // If disposition is NEW_BACKGROUND_TAB, TabStripModel::ADD_SELECTED is
   // removed from |tabstrip_add_types| automatically.
+  // If disposition is one of NEW_WINDOW, NEW_POPUP, NEW_FOREGROUND_TAB or
+  // SINGLETON_TAB, then TabStripModel::ADD_SELECTED is automatically added to
+  // |tabstrip_add_types|.
   WindowOpenDisposition disposition;
 
   // The transition type of the navigation. Default is PageTransition::LINK
   // when target_contents is specified in the constructor.
   PageTransition::Type transition;
 
   // The index the caller would like the tab to be positioned at in the
   // TabStrip. The actual index will be determined by the TabHandler in
   // accordance with |add_types|. Defaults to -1 (allows the TabHandler to
   // decide).
@@ skipping 10 matching lines @@
   // If non-empty, specifies the desired initial position and size of the
   // window if |disposition| == NEW_POPUP.
   // TODO(beng): Figure out if this can be used to create Browser windows
   //             for other callsites that use set_override_bounds, or
   //             remove this comment.
   gfx::Rect window_bounds;
 
   // True if the target window should be made visible at the end of the call
   // to Navigate(). This activates the window if it was already visible.
   // Default is false.
+  // If disposition is NEW_WINDOW or NEW_POPUP, |show_window| is set to true
+  // automatically.
   bool show_window;
 
   // [in]  Specifies a Browser object where the navigation could occur or the
   //       tab could be added. Navigate() is not obliged to use this Browser if
   //       it is not compatible with the operation being performed. If NULL,
   //       |profile| should be specified to find or create a matching Browser.
   // [out] Specifies the Browser object where the navigation occurred or the
   //       tab was added. Guaranteed non-NULL unless the disposition did not
   //       require a navigation, in which case this is set to NULL
   //       (SUPPRESS_OPEN, SAVE_TO_DISK, IGNORE_ACTION).
@@ skipping 10 matching lines @@
  private:
   NavigateParams();
 };
 
 // Navigates according to the configuration specified in |params|.
 void Navigate(NavigateParams* params);
 
 }  // namespace browser
 
 #endif  // CHROME_BROWSER_UI_BROWSER_NAVIGATOR_H_