Revert the Omnibox when changing tabs while its contents have been deleted.

To do this, I needed to add a new TabStripModelObserver call that fired before the tab had been changed, since when the Omnibox asks for the current permanent_text_ it gets it from the selected tab's navigation controller.

BUG=6850
Review URL: http://codereview.chromium.org/113983

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17241 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 6 deletions

diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc
index bdb7fca..8ec46f1 100644
--- a/chrome/browser/browser.cc
+++ b/chrome/browser/browser.cc
@@ -1583,6 +1583,12 @@ void Browser::TabDetachedAt(TabContents* contents, int index) {
                     Source<TabContents>(contents));
 }
 
+void Browser::TabDeselectedAt(TabContents* contents, int index) {
+  // Save what the user's currently typing, so it can be restored when we
+  // switch back to this tab.
+  window_->GetLocationBar()->SaveStateToContents(contents);
+}
+
 void Browser::TabSelectedAt(TabContents* old_contents,
                             TabContents* new_contents,
                             int index,
@@ -1593,12 +1599,6 @@ void Browser::TabSelectedAt(TabContents* old_contents,
   if (!chrome_updater_factory_.empty() && old_contents)
     ProcessPendingUIUpdates();
 
-  if (old_contents) {
-    // Save what the user's currently typing, so it can be restored when we
-    // switch back to this tab.
-    window_->GetLocationBar()->SaveStateToContents(old_contents);
-  }
-
   // Propagate the profile to the location bar.
   UpdateToolbar(true);