Don't show tabbed options page in OTR browser window.

chrome/browser/ui/browser_navigator.cc

 // 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.
 
 #include "chrome/browser/browser_navigator.h"
 
 #include "base/command_line.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_url_handler.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/location_bar.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/renderer_host/site_instance.h"
 #include "chrome/browser/status_bubble.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/chrome_switches.h"
+#include "chrome/common/url_constants.h"
 
 namespace {
 
 // Returns the SiteInstance for |source_contents| if it represents the same
 // website as |url|, or NULL otherwise. |source_contents| cannot be NULL.
 SiteInstance* GetSiteInstance(TabContents* source_contents, const GURL& url) {
   if (!source_contents)
     return NULL;
 
   // Don't use this logic when "--process-per-tab" is specified.
@@ skipping 58 matching lines @@
     TabContents* tab = params->browser->GetTabContentsAt(i);
     if (CompareURLsIgnoreRef(tab->GetURL(), params->url) ||
         CompareURLsIgnoreRef(tab->GetURL(), rewritten_url)) {
       params->target_contents = tab;
       return i;
     }
   }
   return -1;
 }
 
+// Change some of the navigation parameters based on the particular URL.
+// Currently this applies to chrome://settings and the bookmark manager,
+// which we always want to open in a normal (not incognito) window.
+void AdjustNavigateParamsForURL(browser::NavigateParams* params) {
+  bool isChromeUrl = params->url.scheme() == chrome::kChromeUIScheme;
+  bool isSettingsPage = isChromeUrl &&
+      params->url.host() == chrome::kChromeUISettingsHost;
+  bool isBookmarksManager = isChromeUrl &&
+      params->url.host() == chrome::kChromeUIBookmarksHost;
+
+  if (!params->target_contents && (isSettingsPage || isBookmarksManager)) {

[Peter Kasting, 2010/11/12 19:49:01]

Nit: It seems like it'd be simpler (and less redundant) to just do:

  if (!params->target_contents &&
      (params->url.scheme() == chrome::kChromeUIScheme) &&
      ((params->url.host() == chrome::kChromeUISettingsHost) ||
       (params->url.host() == chrome::kChromeUIBookmarksHost))) {

That is just as readable to me and three lines shorter.

[Evan Stade, 2010/11/12 20:47:12]

ok

+    Profile* profile =
+        params->browser ? params->browser->profile() : params->profile;
+
+    if (profile->IsOffTheRecord()) {
+      profile = profile->GetOriginalProfile();
+      Browser* browser = Browser::GetOrCreateTabbedBrowser(profile);
+
+      params->disposition = NEW_FOREGROUND_TAB;
+      params->profile = profile;
+      params->browser = browser;
+      params->tabstrip_add_types = TabStripModel::ADD_SELECTED;
+      params->show_window = true;
+    }
+  }
+}
+
 // Returns a Browser that can host the navigation or tab addition specified in
 // |params|. This might just return the same Browser specified in |params|, or
 // some other if that Browser is deemed incompatible.
 Browser* GetBrowserForDisposition(browser::NavigateParams* params) {
   // If no source TabContents was specified, we use the selected one from the
   // target browser. This must happen first, before GetBrowserForDisposition()
   // has a chance to replace |params->browser| with another one.
   if (!params->source_contents && params->browser)
     params->source_contents = params->browser->GetSelectedTabContents();
 
@@ skipping 167 matching lines @@
       tabstrip_add_types(TabStripModel::ADD_SELECTED),
       show_window(false),
       browser(a_browser),
       profile(NULL) {
 }
 
 NavigateParams::~NavigateParams() {
 }
 
 void Navigate(NavigateParams* params) {
+  AdjustNavigateParamsForURL(params);
+
   params->browser = GetBrowserForDisposition(params);
   if (!params->browser)
     return;
   // Navigate() must not return early after this point.
 
   // Make sure the Browser is shown if params call for it.
   ScopedBrowserDisplayer displayer(params);
 
   // Makes sure any TabContents created by this function is destroyed if
   // not properly added to a tab strip.
@@ skipping 79 matching lines @@
           params->transition,
           params->tabstrip_add_types);
       // Now that the |params->target_contents| is safely owned by the target
       // Browser's TabStripModel, we can release ownership.
       target_contents_owner.ReleaseOwnership();
     }
   }
 }
 
 }  // namespace browser