chrome/browser/find_bar_host_browsertest.cc - Issue 5104002: Cleanup: Include browser.h -> ui/browser.h [Part 4].

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

Issue 5104002: Cleanup: Include browser.h -> ui/browser.h [Part 4]. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 10 years, 1 month 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 | « chrome/browser/extensions/window_open_apitest.cc ('k') | chrome/browser/gtk/browser_titlebar.cc » ('j') | no next file with comments »

OLD	NEW
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 "app/keyboard_codes.h"	5 #include "app/keyboard_codes.h"

6 #include "base/message_loop.h"	6 #include "base/message_loop.h"

7 #include "base/string_util.h"	7 #include "base/string_util.h"

8 #include "base/utf_string_conversions.h"	8 #include "base/utf_string_conversions.h"

9 #include "chrome/browser/browser.h"

10 #include "chrome/browser/browser_window.h"

11 #include "chrome/browser/find_bar.h"	9 #include "chrome/browser/find_bar.h"

12 #include "chrome/browser/find_bar_controller.h"	10 #include "chrome/browser/find_bar_controller.h"

13 #include "chrome/browser/find_notification_details.h"	11 #include "chrome/browser/find_notification_details.h"

14 #include "chrome/browser/profile.h"	12 #include "chrome/browser/profile.h"

15 #include "chrome/browser/renderer_host/render_view_host.h"	13 #include "chrome/browser/renderer_host/render_view_host.h"

16 #include "chrome/browser/tab_contents/tab_contents.h"	14 #include "chrome/browser/tab_contents/tab_contents.h"

17 #include "chrome/browser/tab_contents/tab_contents_view.h"	15 #include "chrome/browser/tab_contents/tab_contents_view.h"

18 #include "chrome/browser/tabs/tab_strip_model.h"	16 #include "chrome/browser/tabs/tab_strip_model.h"

	17 #include "chrome/browser/ui/browser.h"

19 #include "chrome/browser/ui/browser_navigator.h"	18 #include "chrome/browser/ui/browser_navigator.h"

	19 #include "chrome/browser/ui/browser_window.h"

20 #include "chrome/common/notification_service.h"	20 #include "chrome/common/notification_service.h"

21 #include "chrome/test/in_process_browser_test.h"	21 #include "chrome/test/in_process_browser_test.h"

22 #include "chrome/test/ui_test_utils.h"	22 #include "chrome/test/ui_test_utils.h"

23 #include "net/test/test_server.h"	23 #include "net/test/test_server.h"

24	24

25 #if defined(TOOLKIT_VIEWS)	25 #if defined(TOOLKIT_VIEWS)

26 #include "chrome/browser/views/find_bar_host.h"	26 #include "chrome/browser/views/find_bar_host.h"

27 #include "views/focus/focus_manager.h"	27 #include "views/focus/focus_manager.h"

28 #elif defined(TOOLKIT_GTK)	28 #elif defined(TOOLKIT_GTK)

29 #include "chrome/browser/gtk/slide_animator_gtk.h"	29 #include "chrome/browser/gtk/slide_animator_gtk.h"

(...skipping 1031 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1061	1061

1062 TabContents* tab = browser()->GetSelectedTabContents();	1062 TabContents* tab = browser()->GetSelectedTabContents();

1063 int ordinal = 0;	1063 int ordinal = 0;

1064 FindInPageWchar(tab, L"link", kFwd, kIgnoreCase, &ordinal);	1064 FindInPageWchar(tab, L"link", kFwd, kIgnoreCase, &ordinal);

1065 EXPECT_EQ(ordinal, 1);	1065 EXPECT_EQ(ordinal, 1);

1066	1066

1067 // End the find session, click on the link.	1067 // End the find session, click on the link.

1068 tab->StopFinding(FindBarController::kActivateSelection);	1068 tab->StopFinding(FindBarController::kActivateSelection);

1069 EXPECT_TRUE(ui_test_utils::WaitForNavigationInCurrentTab(browser()));	1069 EXPECT_TRUE(ui_test_utils::WaitForNavigationInCurrentTab(browser()));

1070 }	1070 }

OLD	NEW