summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authorbeng@google.com <beng@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-07-30 00:41:08 +0000
committerbeng@google.com <beng@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-07-30 00:41:08 +0000
commit971892dea6d3b71a876976c03677ddc3958af782 (patch)
tree6f0c219092f778df530b7199ccabbc75ae22d416 /chrome/browser
parentad7bc681c78532ec0aa06177857575a96a59df4d (diff)
downloadchromium_src-971892dea6d3b71a876976c03677ddc3958af782.zip
chromium_src-971892dea6d3b71a876976c03677ddc3958af782.tar.gz
chromium_src-971892dea6d3b71a876976c03677ddc3958af782.tar.bz2
Fix a crash. Now sometimes TabContentses can be NULL it seems.
B=1297990 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@84 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/tabs/tab_strip.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/tabs/tab_strip.cc b/chrome/browser/tabs/tab_strip.cc
index 71936b2..504cd0c 100644
--- a/chrome/browser/tabs/tab_strip.cc
+++ b/chrome/browser/tabs/tab_strip.cc
@@ -820,8 +820,9 @@ void TabStrip::SelectTab(Tab* tab) {
void TabStrip::CloseTab(Tab* tab) {
int tab_index = GetIndexOfTab(tab);
if (tab_index != -1) {
- UserMetrics::RecordAction(L"CloseTab_Mouse",
- model_->GetTabContentsAt(tab_index)->profile());
+ TabContents* contents = model_->GetTabContentsAt(tab_index);
+ if (contents)
+ UserMetrics::RecordAction(L"CloseTab_Mouse", contents->profile());
Tab* last_tab = GetTabAt(GetTabCount() - 1);
// Limit the width available to the TabStrip for laying out Tabs, so that
// Tabs are not resized until a later time (when the mouse pointer leaves