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

Unified Diff: chrome/browser/ui/tabs/tab_strip_model.cc

Issue 10937028: Do not discard selected tab (Closed) Base URL: http://git.chromium.org/chromium/src.git@new
Patch Set: handle active tab Created 8 years, 3 months 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/ui/tabs/tab_strip_model.cc
diff --git a/chrome/browser/ui/tabs/tab_strip_model.cc b/chrome/browser/ui/tabs/tab_strip_model.cc
index 2c63cf8a8ec575109adfc6a865474344b97bfe44..9b87c52b5949bbe7b82c9ba09c9b88a86db70d97 100644
--- a/chrome/browser/ui/tabs/tab_strip_model.cc
+++ b/chrome/browser/ui/tabs/tab_strip_model.cc
@@ -205,6 +205,10 @@ void TabStripModel::ReplaceNavigationControllerAt(
TabContents* TabStripModel::DiscardTabContentsAt(int index) {
DCHECK(ContainsIndex(index));
+ // Do not discard active tab.
+ if (active_index() == index)
+ return NULL;
+
TabContents* null_contents = TabContents::Factory::CreateTabContents(
WebContents::Create(profile(),
NULL /* site_instance */,
« no previous file with comments | « chrome/browser/chromeos/oom_priority_manager_browsertest.cc ('k') | chrome/browser/ui/tabs/tab_strip_model_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698