[Extensions Toolbar] Protect against crazy bounds

chrome/browser/ui/views/toolbar/toolbar_view.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/toolbar/toolbar_view.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/i18n/number_formatting.h"
@@ skipping 575 matching lines @@
     home_->SetVisible(true);
     home_->SetBounds(next_element_x, child_y,
                      home_->GetPreferredSize().width(), child_height);
   } else {
     home_->SetVisible(false);
     home_->SetBounds(next_element_x, child_y, 0, child_height);
   }
   next_element_x = home_->bounds().right() +
                    GetLayoutConstant(TOOLBAR_VIEW_STANDARD_SPACING);
 
-  int browser_actions_width = browser_actions_->GetPreferredSize().width();
+  int browser_actions_desired_width =
+      browser_actions_->GetPreferredSize().width();
   int app_menu_width = app_menu_->GetPreferredSize().width();
   const int location_bar_right_padding =
       GetLayoutConstant(TOOLBAR_VIEW_LOCATION_BAR_RIGHT_PADDING);
+
   int available_width = std::max(
-      0, width() - insets.right() - app_menu_width - browser_actions_width -
-             (browser_actions_width > 0 ? element_padding : 0) -
+      0, width() - insets.right() - app_menu_width -
+             (browser_actions_desired_width > 0 ? element_padding : 0) -
              location_bar_right_padding - next_element_x);
+  // Don't allow the omnibox to shrink to the point of non-existence, so
+  // subtract its minimum width from the available width to reserve it.
+  int minimum_location_bar_width = location_bar_->GetMinimumSize().width();
+  int browser_actions_width =
+      std::min(std::max(available_width - minimum_location_bar_width, 0),
+               browser_actions_desired_width);
+  available_width -= browser_actions_width;
+  int location_bar_width = available_width;
 
   int location_height = location_bar_->GetPreferredSize().height();
   int location_y = CenteredChildY(height(), location_height);
 
   location_bar_->SetBounds(next_element_x, location_y,
-                           std::max(available_width, 0), location_height);
+                           location_bar_width, location_height);
   next_element_x = location_bar_->bounds().right() + location_bar_right_padding;
 
   browser_actions_->SetBounds(
       next_element_x, child_y, browser_actions_width, child_height);
   next_element_x = browser_actions_->bounds().right();
   if (browser_actions_width > 0)
     next_element_x += element_padding;
 
   // The browser actions need to do a layout explicitly, because when an
   // extension is loaded/unloaded/changed, BrowserActionContainer removes and
@@ skipping 206 matching lines @@
   Layout();
   SchedulePaint();
 }
 
 int ToolbarView::content_shadow_height() const {
   return GetLayoutConstant(
       (browser_->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH)
           ? TOOLBAR_VIEW_CONTENT_SHADOW_HEIGHT_ASH
           : TOOLBAR_VIEW_CONTENT_SHADOW_HEIGHT);
 }