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

chrome/browser/gtk/tabs/tab_strip_gtk.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/gtk/tabs/tab_strip_gtk.h"
 
 #include <algorithm>
 
 #include "app/gtk_dnd_util.h"
 #include "app/resource_bundle.h"
 #include "app/slide_animation.h"
 #include "base/i18n/rtl.h"
 #include "base/string_util.h"
 #include "chrome/browser/autocomplete/autocomplete.h"
+#include "chrome/browser/browser.h"
 #include "chrome/browser/gtk/browser_window_gtk.h"
 #include "chrome/browser/gtk/custom_button.h"
 #include "chrome/browser/gtk/gtk_theme_provider.h"
 #include "chrome/browser/gtk/gtk_util.h"
 #include "chrome/browser/gtk/tabs/dragged_tab_controller_gtk.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tabs/tab_strip_model_delegate.h"
 #include "chrome/browser/themes/browser_theme_provider.h"
+#include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/notification_type.h"
 #include "gfx/gtk_util.h"
 #include "gfx/point.h"
 #include "grit/app_resources.h"
 #include "grit/theme_resources.h"
 
 namespace {
 
 const int kDefaultAnimationDurationMs = 100;
@@ skipping 1571 matching lines @@
   const bool drop_before = drop_info_->drop_before;
 
   // Destroy the drop indicator.
   drop_info_.reset();
 
   std::string url_string(reinterpret_cast<char*>(data));
   GURL url(url_string.substr(0, url_string.find_first_of('\n')));
   if (!url.is_valid())
     return false;
 
+  browser::NavigateParams params(window()->browser(), url,
+                                 PageTransition::LINK);
+  params.tabstrip_index = drop_index;
+
   if (drop_before) {
-    // Insert a new tab.
-    TabContents* contents =
-        model_->delegate()->CreateTabContentsForURL(
-            url, GURL(), model_->profile(), PageTransition::TYPED, false,
-            NULL);
-    model_->AddTabContents(contents, drop_index, PageTransition::GENERATED,
-                           TabStripModel::ADD_SELECTED);
+    params.disposition = NEW_FOREGROUND_TAB;
   } else {
-    model_->GetTabContentsAt(drop_index)->controller().LoadURL(
-        url, GURL(), PageTransition::GENERATED);
-    model_->SelectTabContentsAt(drop_index, true);
+    params.disposition = CURRENT_TAB;
+    params.source_contents = model_->GetTabContentsAt(drop_index);
   }
 
+  browser::Navigate(&params);
+
   return true;
 }
 
 // static
 GdkPixbuf* TabStripGtk::GetDropArrowImage(bool is_down) {
   return ResourceBundle::GetSharedInstance().GetPixbufNamed(
       is_down ? IDR_TAB_DROP_DOWN : IDR_TAB_DROP_UP);
 }
 
 // TabStripGtk::DropInfo -------------------------------------------------------
@@ skipping 328 matching lines @@
     case 1:
       model_->delegate()->AddBlankTab(true);
       break;
     case 2: {
       // On middle-click, try to parse the PRIMARY selection as a URL and load
       // it instead of creating a blank page.
       GURL url;
       if (!gtk_util::URLFromPrimarySelection(model_->profile(), &url))
         return;
 
-      TabContents* contents =
-          model_->delegate()->CreateTabContentsForURL(
-              url,
-              GURL(),  // referrer
-              model_->profile(),
-              PageTransition::TYPED,
-              false,   // defer_load
-              NULL);   // instance
-      model_->AddTabContents(
-          contents,
-          -1,     // index
-          PageTransition::TYPED,
-          TabStripModel::ADD_SELECTED);
+      Browser* browser = window_->browser();
+      DCHECK(browser);
+      browser->AddSelectedTabWithURL(url, PageTransition::TYPED);
       break;
     }
     default:
       NOTREACHED() << "Got click on new tab button with unhandled mouse "
                    << "button " << mouse_button;
   }
 }
 
 void TabStripGtk::SetTabBounds(TabGtk* tab, const gfx::Rect& bounds) {
   gfx::Rect bds = bounds;
@@ skipping 35 matching lines @@
 
   // Let the middle mouse button initiate clicks as well.
   gtk_util::SetButtonTriggersNavigation(button->widget());
   g_signal_connect(button->widget(), "clicked",
                    G_CALLBACK(OnNewTabClickedThunk), this);
   GTK_WIDGET_UNSET_FLAGS(button->widget(), GTK_CAN_FOCUS);
   gtk_fixed_put(GTK_FIXED(tabstrip_.get()), button->widget(), 0, 0);
 
   return button;
 }