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

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

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view_mus.h"
 
 #include <algorithm>
 
 #include "base/profiler/scoped_tracker.h"
 #include "chrome/app/chrome_command_ids.h"
@@ skipping 370 matching lines @@
 
 bool BrowserNonClientFrameViewMus::DoesIntersectRect(
     const views::View* target,
     const gfx::Rect& rect) const {
   CHECK_EQ(target, this);
   if (!views::ViewTargeterDelegate::DoesIntersectRect(this, rect)) {
     // |rect| is outside BrowserNonClientFrameViewMus's bounds.
     return false;
   }
 
-  TabStrip* tabstrip = browser_view()->tabstrip();
-  if (tabstrip && browser_view()->IsTabStripVisible()) {
-    // Claim |rect| only if it is above the bottom of the tabstrip in a non-tab
-    // portion.
-    gfx::RectF rect_in_tabstrip_coords_f(rect);
-    View::ConvertRectToTarget(this, tabstrip, &rect_in_tabstrip_coords_f);
-    gfx::Rect rect_in_tabstrip_coords =
-        gfx::ToEnclosingRect(rect_in_tabstrip_coords_f);
-
-    if (rect_in_tabstrip_coords.y() > tabstrip->height())
-      return false;
-
-    return !tabstrip->HitTestRect(rect_in_tabstrip_coords) ||
-           tabstrip->IsRectInWindowCaption(rect_in_tabstrip_coords);
+  if (!browser_view()->IsTabStripVisible()) {
+    // Claim |rect| if it is above the top of the topmost view in the client
+    // area.
+    return rect.y() < GetTopInset(false);
   }
 
-  // Claim |rect| if it is above the top of the topmost view in the client area.
-  return rect.y() < GetTopInset(false);
+  // Claim |rect| only if it is above the bottom of the tabstrip in a non-tab
+  // portion.
+  TabStrip* tabstrip = browser_view()->tabstrip();
+  gfx::RectF rect_in_tabstrip_coords_f(rect);
+  View::ConvertRectToTarget(this, tabstrip, &rect_in_tabstrip_coords_f);
+  gfx::Rect rect_in_tabstrip_coords =
+      gfx::ToEnclosingRect(rect_in_tabstrip_coords_f);
+
+  if (rect_in_tabstrip_coords.y() > tabstrip->height())
+    return false;
+
+  return !tabstrip->HitTestRect(rect_in_tabstrip_coords) ||
+         tabstrip->IsRectInWindowCaption(rect_in_tabstrip_coords);

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

This is functionally equivalent to the Ash code but not laid out quite the same.
 It would be nice to make these two exactly the same.

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

Done.

 }
 
 int BrowserNonClientFrameViewMus::GetTabStripLeftInset() const {
   const gfx::Insets insets(GetLayoutInsets(AVATAR_ICON));
   const int avatar_right =
       avatar_button() ? (insets.left() + GetOTRAvatarIcon().width()) : 0;
   return avatar_right + insets.right() + frame_values().normal_insets.left();
 }
 
 int BrowserNonClientFrameViewMus::GetTabStripRightInset() const {
@@ skipping 203 matching lines @@
 }
 
 void BrowserNonClientFrameViewMus::PaintContentEdge(gfx::Canvas* canvas) {
   DCHECK(!UsePackagedAppHeaderStyle() && !UseWebAppHeaderStyle());
   const int bottom = frame_values().normal_insets.bottom();
   canvas->FillRect(
       gfx::Rect(0, bottom, width(), kClientEdgeThickness),
       GetThemeProvider()->GetColor(
           ThemeProperties::COLOR_TOOLBAR_BOTTOM_SEPARATOR));
 }