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/common/notification_service.h"
@@ skipping 1942 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();
+      if (!browser) {

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

Nit: Just DCHECK(browser) and keep going.  ("Don't handle DCHECK failures")

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

Done.

+        NOTREACHED();
+        break;
+      }
+
+      browser->AddSelectedTabWithURL(url, PageTransition::TYPED);

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

This should actually be LINK rather than TYPED (the old code was wrong).

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

Done.

       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;
 }