Speculative fix for crash during browser startup with opaque frame.

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

 // Copyright 2013 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/opaque_browser_frame_view_layout.h"
 
 #include "base/command_line.h"
 #include "build/build_config.h"
 #include "chrome/browser/profiles/profiles_state.h"
 #include "chrome/browser/ui/layout_constants.h"
@@ skipping 369 matching lines @@
 void OpaqueBrowserFrameViewLayout::LayoutIncognitoIcon(views::View* host) {
   const int old_button_size = leading_button_start_ + trailing_button_start_;
 
   // Any buttons/icon/title were laid out based on the frame border thickness,
   // but the tabstrip bounds need to be based on the non-client border thickness
   // on any side where there aren't other buttons forcing a larger inset.
   const bool md = ui::MaterialDesignController::IsModeMaterial();
   int min_button_width = NonClientBorderThickness();
   // In non-MD, the toolbar has a rounded corner that we don't want the tabstrip
   // to overlap.
-  if (!md && !avatar_button_)
+  if (!md && !avatar_button_ && delegate_->IsToolbarVisible())
     min_button_width += delegate_->GetToolbarLeadingCornerClientWidth();
   leading_button_start_ = std::max(leading_button_start_, min_button_width);
   // The trailing corner is a mirror of the leading one.
   trailing_button_start_ = std::max(trailing_button_start_, min_button_width);
 
   if (avatar_button_) {
     const gfx::Insets insets(GetLayoutInsets(AVATAR_ICON));
     const gfx::Size size(delegate_->GetOTRAvatarIcon().size());
     const int incognito_width = insets.left() + size.width();
     int x;
@@ skipping 230 matching lines @@
 
 void OpaqueBrowserFrameViewLayout::ViewAdded(views::View* host,
                                              views::View* view) {
   SetView(view->id(), view);
 }
 
 void OpaqueBrowserFrameViewLayout::ViewRemoved(views::View* host,
                                                views::View* view) {
   SetView(view->id(), nullptr);
 }