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

chrome/browser/dom_ui/options/options_ui.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/dom_ui/options/options_ui.h"
 
 #include <algorithm>
 
 #include "app/resource_bundle.h"
 #include "base/callback.h"
@@ skipping 222 matching lines @@
   DOMUI::RenderViewCreated(render_view_host);
 }
 
 // static
 RefCountedMemory* OptionsUI::GetFaviconResourceBytes() {
   return ResourceBundle::GetSharedInstance().
       LoadDataResourceBytes(IDR_SETTINGS_FAVICON);
 }
 
 void OptionsUI::InitializeHandlers() {
+  // Don't open a settings tab in an OTR profile. For most cases, we won't
+  // get this far as browser::Navigate() will redirect the request to a
+  // non-OTR profile, but there are some corner cases where a chrome://settings
+  // load can slip through (such as dragging an anchor link to the tab strip).
+  Profile* profile = GetProfile();
+  if (profile->IsOffTheRecord()) {
+    // Re-open the tab in a normal window.
+    Browser* normal_browser = Browser::GetOrCreateTabbedBrowser(
+        profile->GetOriginalProfile());
+    normal_browser->AddSelectedTabWithURL(GURL(chrome::kChromeUISettingsURL),
+                                          PageTransition::LINK);
+
+    // Close this tab.
+    Browser* otr_browser = Browser::GetOrCreateTabbedBrowser(profile);
+    otr_browser->CloseTabContents(tab_contents());
+    return;

[Ben Goodger (Google), 2010/11/15 18:21:04]

Why are you also handling this here when you did so in Navigate?

[Evan Stade, 2010/11/15 18:51:47]

see CL description

[Ben Goodger (Google), 2010/11/15 18:57:19]

Can you make the drag and drop handling code use browser_navigator too then
instead of doing this?

+  }
+
   std::vector<DOMMessageHandler*>::iterator iter;
   for (iter = handlers_.begin(); iter != handlers_.end(); ++iter) {
     (static_cast<OptionsPageUIHandler*>(*iter))->Initialize();
   }
 }
 
 void OptionsUI::AddOptionsPageUIHandler(DictionaryValue* localized_strings,
                                         OptionsPageUIHandler* handler_raw) {
   scoped_ptr<OptionsPageUIHandler> handler(handler_raw);
   DCHECK(handler.get());
   // Add only if handler's service is enabled.
   if (handler->IsEnabled()) {
     handler->GetLocalizedValues(localized_strings);
     // Add handler to the list and also pass the ownership.
     AddMessageHandler(handler.release()->Attach(this));
   }
 }