Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1116)

Side by Side Diff: chrome/browser/views/find_bar_host_browsertest.cc

Issue 565006: Looks like the fix I did last time did work. According to the... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 10 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/keyboard_codes.h" 5 #include "base/keyboard_codes.h"
6 #include "base/message_loop.h" 6 #include "base/message_loop.h"
7 #include "chrome/browser/browser.h" 7 #include "chrome/browser/browser.h"
8 #include "chrome/browser/browser_window.h" 8 #include "chrome/browser/browser_window.h"
9 #include "chrome/browser/find_bar_controller.h" 9 #include "chrome/browser/find_bar_controller.h"
10 #include "chrome/browser/find_notification_details.h" 10 #include "chrome/browser/find_notification_details.h"
(...skipping 536 matching lines...) Expand 10 before | Expand all | Expand 10 after
547 EXPECT_TRUE(fully_visible); 547 EXPECT_TRUE(fully_visible);
548 548
549 browser()->ShowHistoryTab(); 549 browser()->ShowHistoryTab();
550 550
551 // Make sure Find box is closed. 551 // Make sure Find box is closed.
552 EXPECT_TRUE(GetFindBarWindowInfo(&position, &fully_visible)); 552 EXPECT_TRUE(GetFindBarWindowInfo(&position, &fully_visible));
553 EXPECT_FALSE(fully_visible); 553 EXPECT_FALSE(fully_visible);
554 } 554 }
555 555
556 // Make sure Find box moves out of the way if it is obscuring the active match. 556 // Make sure Find box moves out of the way if it is obscuring the active match.
557 // Flaky, see http://crbug.com/16447. 557 IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, FindMovesWhenObscuring) {
558 IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, FLAKY_FindMovesWhenObscuring) {
559 HTTPTestServer* server = StartHTTPServer(); 558 HTTPTestServer* server = StartHTTPServer();
560 559
561 GURL url = server->TestServerPageW(kMoveIfOver); 560 GURL url = server->TestServerPageW(kMoveIfOver);
562 ui_test_utils::NavigateToURL(browser(), url); 561 ui_test_utils::NavigateToURL(browser(), url);
563 562
564 // Open the Find window with animations disabled. 563 // Open the Find window with animations disabled.
565 DropdownBarHost::disable_animations_during_testing_ = true; 564 DropdownBarHost::disable_animations_during_testing_ = true;
566 browser()->ShowFindBar(); 565 browser()->ShowFindBar();
567 566
568 gfx::Point start_position; 567 gfx::Point start_position;
(...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after
786 // Find "given". 785 // Find "given".
787 FindInPageWchar(tab2, L"given", kFwd, kIgnoreCase, &ordinal); 786 FindInPageWchar(tab2, L"given", kFwd, kIgnoreCase, &ordinal);
788 787
789 // Switch back to first tab. 788 // Switch back to first tab.
790 browser()->SelectTabContentsAt(0, false); 789 browser()->SelectTabContentsAt(0, false);
791 browser()->GetFindBarController()->EndFindSession(); 790 browser()->GetFindBarController()->EndFindSession();
792 // Simulate F3. 791 // Simulate F3.
793 ui_test_utils::FindInPage(tab1, string16(), kFwd, kIgnoreCase, &ordinal); 792 ui_test_utils::FindInPage(tab1, string16(), kFwd, kIgnoreCase, &ordinal);
794 EXPECT_EQ(tab1->find_text(), WideToUTF16(L"Default")); 793 EXPECT_EQ(tab1->find_text(), WideToUTF16(L"Default"));
795 } 794 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698