Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6146)

Unified Diff: chrome/browser/gtk/tabs/tab_strip_gtk.cc

Issue 4655002: Don't show tabbed options page in OTR browser window. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: handle bookmark manager as well Created 10 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/gtk/tabs/tab_strip_gtk.cc
diff --git a/chrome/browser/gtk/tabs/tab_strip_gtk.cc b/chrome/browser/gtk/tabs/tab_strip_gtk.cc
index 054781546e5be01867fa69f0cf684af4c30856c2..027b1ba334ce3b608df4cd2163f7b72108e9f852 100644
--- a/chrome/browser/gtk/tabs/tab_strip_gtk.cc
+++ b/chrome/browser/gtk/tabs/tab_strip_gtk.cc
@@ -12,6 +12,7 @@
#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"
@@ -1974,19 +1975,13 @@ void TabStripGtk::OnNewTabClicked(GtkWidget* widget) {
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
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 (th
Evan Stade 2010/11/12 20:47:12 Done.
break;
}
default:

Powered by Google App Engine
This is Rietveld 408576698