Make Windows FindBar stay within window bounds for narrow windows

chrome/browser/ui/views/find_bar_host.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_host.h"
 
 #include <algorithm>
 
 #include "chrome/browser/ui/find_bar/find_bar_controller.h"
 #include "chrome/browser/ui/find_bar/find_tab_helper.h"
@@ skipping 107 matching lines @@
   if (!find_bar_controller_->tab_contents() ||
       !find_bar_controller_->
           tab_contents()->find_tab_helper()->find_ui_active()) {
     return;
   }
 
   gfx::Rect new_pos = GetDialogPosition(selection_rect);
   SetDialogPosition(new_pos, no_redraw);
 
   // May need to redraw our frame to accommodate bookmark bar styles.
+  view()->Layout();  // Bounds may have changed.
   view()->SchedulePaint();
 }
 
 void FindBarHost::SetFindText(const string16& find_text) {
   find_bar_view()->SetFindText(find_text);
 }
 
 void FindBarHost::UpdateUIForFindResult(const FindNotificationDetails& result,
                                         const string16& find_text) {
   // Make sure match count is clear. It may get set again in UpdateForResult
@@ skipping 85 matching lines @@
 
 string16 FindBarHost::GetFindSelectedText() {
   return find_bar_view()->GetFindSelectedText();
 }
 
 string16 FindBarHost::GetMatchCountText() {
   return find_bar_view()->GetMatchCountText();
 }
 
 int FindBarHost::GetWidth() {
-  NOTIMPLEMENTED();
-  return 0;
+  return view()->width();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Overridden from DropdownBarHost:
 
 gfx::Rect FindBarHost::GetDialogPosition(gfx::Rect avoid_overlapping_rect) {
   // Find the area we have to work with (after accounting for scrollbars, etc).
   gfx::Rect widget_bounds;
   GetWidgetBounds(&widget_bounds);
   if (widget_bounds.IsEmpty())
     return gfx::Rect();
 
   // Ask the view how large an area it needs to draw on.
   gfx::Size prefsize = view()->GetPreferredSize();
 
+  // Limit width to the available area.
+  if (widget_bounds.width() < prefsize.width())
+    prefsize.set_width(widget_bounds.width());
+
   // Place the view in the top right corner of the widget boundaries (top left
   // for RTL languages).
   gfx::Rect view_location;
   int x = widget_bounds.x();
   if (!base::i18n::IsRTL())
     x += widget_bounds.width() - prefsize.width();
   int y = widget_bounds.y();
   view_location.SetRect(x, y, prefsize.width(), prefsize.height());
 
   // When we get Find results back, we specify a selection rect, which we
@@ skipping 51 matching lines @@
 
   DropdownBarHost::UnregisterAccelerators();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // private:
 
 FindBarView* FindBarHost::find_bar_view() {
   return static_cast<FindBarView*>(view());
 }