summaryrefslogtreecommitdiffstats
path: root/chrome/browser/tabs
diff options
context:
space:
mode:
authorandybons@chromium.org <andybons@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-14 20:54:23 +0000
committerandybons@chromium.org <andybons@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-14 20:54:23 +0000
commit6fba10cb982c7cceb17aebbf8319e8d2271086be (patch)
tree5a5f81bfc65d5879a76ca18be02040e47479011b /chrome/browser/tabs
parentfceab60b63b40d8f9da30192dd9da0e58a1a95f4 (diff)
downloadchromium_src-6fba10cb982c7cceb17aebbf8319e8d2271086be.zip
chromium_src-6fba10cb982c7cceb17aebbf8319e8d2271086be.tar.gz
chromium_src-6fba10cb982c7cceb17aebbf8319e8d2271086be.tar.bz2
[Mac] Finish implementation of App Tabs. This takes into account the UI consolidation of pinned and nano tabs tracked in issue 49013.
TEST=none BUG=45539,49013 Review URL: http://codereview.chromium.org/2952004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52394 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tabs')
-rw-r--r--chrome/browser/tabs/tab_strip_model.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/tabs/tab_strip_model.cc b/chrome/browser/tabs/tab_strip_model.cc
index ba613a1..ef4677b 100644
--- a/chrome/browser/tabs/tab_strip_model.cc
+++ b/chrome/browser/tabs/tab_strip_model.cc
@@ -464,7 +464,8 @@ bool TabStripModel::IsMiniTab(int index) const {
}
bool TabStripModel::IsAppTab(int index) const {
- return GetTabContentsAt(index)->is_app();
+ TabContents* contents = GetTabContentsAt(index);
+ return contents && contents->is_app();
}
bool TabStripModel::IsToolbarVisible(int index) const {