Check for null |tabstrip_| in BrowserView::IsTabStripVisible()

chrome/browser/ui/views/frame/browser_view.cc

Index: chrome/browser/ui/views/frame/browser_view.cc
diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc
index 7d583154d344ac942e7af0975acdcaa9d4ba50ab..96eb9b16a1e2ddb0463c27e7505cf74a9e0ae667 100644
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -577,8 +577,7 @@ int BrowserView::GetTabStripHeight() const {
   // We want to return tabstrip_->height(), but we might be called in the midst
   // of layout, when that hasn't yet been updated to reflect the current state.
   // So return what the tabstrip height _ought_ to be right now.
-  return tabstrip_ && IsTabStripVisible() ?
-      tabstrip_->GetPreferredSize().height() : 0;
+  return IsTabStripVisible() ? tabstrip_->GetPreferredSize().height() : 0;
 }
 
 gfx::Point BrowserView::OffsetPointForToolbarBackgroundImage(
@@ -594,9 +593,11 @@ gfx::Point BrowserView::OffsetPointForToolbarBackgroundImage(
 
 bool BrowserView::IsTabStripVisible() const {
   if (immersive_mode_controller_->ShouldHideTopViews() &&
-      immersive_mode_controller_->ShouldHideTabIndicators())
+      immersive_mode_controller_->ShouldHideTabIndicators()) {
     return false;
-  return browser_->SupportsWindowFeature(Browser::FEATURE_TABSTRIP);
+  }
+  return tabstrip_ &&
+         browser_->SupportsWindowFeature(Browser::FEATURE_TABSTRIP);

[Peter Kasting, 2016/03/11 22:19:50]

Nit: I might reverse the order of these two conditions, since the
SupportsWindowFeature() call is more of the "do we conceptually have a visible
tabstrip" and the |tabstrip_| check is just a "and has it been created yet"
check.

We could maybe even add comments:

  // Does this window normally display a tabstrip?
  if (!browser_->SupportsWindowFeature(Browser::FEATURE_TABSTRIP))
    return false;

  // And has that tabstrip been created yet (by InitViews())?  Note that we
  // can't just check this alone, as the tabstrip is created unconditionally
  // even for windows that won't display it.
  return tabstrip_ != nullptr;

[tdanderson, 2016/03/14 20:38:33]

Done.

 }
 
 bool BrowserView::IsOffTheRecord() const {