Make Windows FindBar stay within window bounds for narrow windows

chrome/browser/ui/views/find_bar_view.cc

 // Copyright (c) 2011 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/find_bar_view.h"
 
 #include <algorithm>
 
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
@@ skipping 240 matching lines @@
   canvas->TileImageInt(*background_, find_text_x, back_button_origin.y(),
                        back_button_origin.x() - find_text_x,
                        background_->height());
 
   PaintAnimatingEdges(canvas, bounds);
 
   canvas->Restore();
 }
 
 void FindBarView::Layout() {
-  gfx::Size panel_size = GetPreferredSize();
+  int panel_width = GetPreferredSize().width();
+
+  // Stay within view bounds.
+  int view_width = width();
+  if (view_width && view_width < panel_width)
+    panel_width = view_width;
 
   // First we draw the close button on the far right.
   gfx::Size sz = close_button_->GetPreferredSize();
-  close_button_->SetBounds(panel_size.width() - sz.width() -
+  close_button_->SetBounds(panel_width - sz.width() -
                                kMarginRightOfCloseButton,
                            (height() - sz.height()) / 2,
                            sz.width(),
                            sz.height());
   // Set the color.
   OnThemeChanged();
 
   // Next, the FindNext button to the left the close button.
   sz = find_next_button_->GetPreferredSize();
   find_next_button_->SetBounds(close_button_->x() -
@@ skipping 27 matching lines @@
   int match_count_x = find_previous_button_->x() -
                       kWhiteSpaceAfterMatchCountLabel -
                       sz.width();
   match_count_text_->SetBounds(match_count_x,
                                (height() - sz.height()) / 2,
                                sz.width(),
                                sz.height());
 
   // And whatever space is left in between, gets filled up by the find edit box.
   sz = find_text_->GetPreferredSize();
-  sz.set_width(match_count_x - kMarginLeftOfFindTextfield);
-  find_text_->SetBounds(match_count_x - sz.width(),
+  sz.set_width(std::max(0, match_count_x - kMarginLeftOfFindTextfield));
+  int find_text_x = std::max(0, match_count_x - sz.width());
+  find_text_->SetBounds(find_text_x,
                         (height() - sz.height()) / 2 + 1,
                         sz.width(),
                         sz.height());
 
   // The focus forwarder view is a hidden view that should cover the area
   // between the find text box and the find button so that when the user clicks
   // in that area we focus on the find text box.
   int find_text_edge = find_text_->x() + find_text_->width();
   focus_forwarder_view_->SetBounds(find_text_edge,
                                    find_previous_button_->y(),
@@ skipping 159 matching lines @@
 
 void FindBarView::OnThemeChanged() {
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   if (GetThemeProvider()) {
     close_button_->SetBackground(
         GetThemeProvider()->GetColor(ThemeService::COLOR_TAB_TEXT),
         rb.GetBitmapNamed(IDR_CLOSE_BAR),
         rb.GetBitmapNamed(IDR_CLOSE_BAR_MASK));
   }
 }