Make FindBar obey dialog bounds for GTK. Will fix other platforms in separate patches.

chrome/browser/ui/find_bar/find_bar_host_browsertest.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 "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/find_bar/find_bar.h"
 #include "chrome/browser/ui/find_bar/find_bar_controller.h"
 #include "chrome/browser/ui/find_bar/find_notification_details.h"
 #include "chrome/browser/ui/find_bar/find_tab_helper.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
+#include "chrome/common/url_constants.h"
 #include "chrome/test/in_process_browser_test.h"
 #include "chrome/test/ui_test_utils.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/browser/tab_contents/tab_contents_view.h"
 #include "net/test/test_server.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 
 #if defined(TOOLKIT_VIEWS)
 #include "chrome/browser/ui/views/find_bar_host.h"
@@ skipping 59 matching lines @@
         browser->GetFindBarController()->find_bar()->GetFindBarTesting();
     return find_bar->GetFindText();
   }
 
   string16 GetFindBarText() {
     return GetFindBarTextForBrowser(browser());
   }
 
   string16 GetFindBarMatchCountTextForBrowser(Browser* browser) {
     FindBarTesting* find_bar =
-      browser->GetFindBarController()->find_bar()->GetFindBarTesting();
+        browser->GetFindBarController()->find_bar()->GetFindBarTesting();
     return find_bar->GetMatchCountText();
   }
 
   string16 GetMatchCountText() {
     return GetFindBarMatchCountTextForBrowser(browser());
   }
 
+  int GetFindBarWidthForBrowser(Browser* browser) {
+    FindBarTesting* find_bar =
+        browser->GetFindBarController()->find_bar()->GetFindBarTesting();
+    return find_bar->GetWidth();
+  }
+
   void EnsureFindBoxOpenForBrowser(Browser* browser) {
     browser->ShowFindBar();
     gfx::Point position;
     bool fully_visible = false;
     EXPECT_TRUE(GetFindBarWindowInfoForBrowser(
                     browser, &position, &fully_visible));
     EXPECT_TRUE(fully_visible);
   }
 
   void EnsureFindBoxOpen() {
@@ skipping 958 matching lines @@
 
   TabContentsWrapper* tab = browser()->GetSelectedTabContentsWrapper();
   int ordinal = 0;
   FindInPageWchar(tab, L"link", kFwd, kIgnoreCase, &ordinal);
   EXPECT_EQ(ordinal, 1);
 
   // End the find session, click on the link.
   tab->find_tab_helper()->StopFinding(FindBarController::kActivateSelection);
   EXPECT_TRUE(ui_test_utils::WaitForNavigationInCurrentTab(browser()));
 }
+
+// Tests that FindBar fits within a narrow browser window.
+IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, FitWindow) {

[Evan Stade, 2011/05/25 18:18:10]

don't you need to disable this on mac?

[jennb, 2011/05/25 19:02:41]

I've set things up so that this test passes on the other platforms even though I
haven't fixed FindBar there by making GetWidth return 0 on them.

[Evan Stade, 2011/05/25 19:14:01]

ok, but that seems deceptive. If I looked at this test I'd assume it's
meaningful on all platforms.

[jennb, 2011/05/25 19:33:41]

I'm actively working on the FindBars for the other platforms.  This is just a
way to break up my patches.  I have NOTIMPLEMENTED in the GetWIdth() impls as a
TODO indicator. 

+  Browser::CreateParams params(Browser::TYPE_POPUP, browser()->profile());
+  params.initial_bounds = gfx::Rect(0, 0, 250, 500);
+  Browser* popup = Browser::CreateWithParams(params);
+  popup->AddSelectedTabWithURL(GURL(chrome::kAboutBlankURL),
+                               PageTransition::LINK);
+
+  // Wait for the page to finish loading.
+  ui_test_utils::WaitForNavigation(
+      &popup->GetSelectedTabContents()->controller());
+  popup->window()->Show();
+
+  // On GTK, bounds change is asynchronous.
+  MessageLoop::current()->RunAllPending();
+
+  EnsureFindBoxOpenForBrowser(popup);
+
+  // GTK adjusts FindBar size asynchronously.
+  MessageLoop::current()->RunAllPending();
+
+  ASSERT_LE(GetFindBarWidthForBrowser(popup),
+            popup->window()->GetBounds().width());
+}