chrome/browser/ui/find_bar/find_bar_host_browsertest.cc - Issue 6598084: Get rid of temporary render_view_host.h.

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

Issue 6598084: Get rid of temporary render_view_host.h. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: Created 9 years, 9 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 | « chrome/browser/ui/cocoa/tab_contents/web_drop_target.mm ('k') | chrome/browser/ui/find_bar/find_tab_helper.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 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/message_loop.h"	5 #include "base/message_loop.h"

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

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

8 #include "chrome/browser/profiles/profile.h"	8 #include "chrome/browser/profiles/profile.h"

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

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

11 #include "chrome/browser/tab_contents/tab_contents_view.h"

12 #include "chrome/browser/tabs/tab_strip_model.h"	9 #include "chrome/browser/tabs/tab_strip_model.h"

13 #include "chrome/browser/ui/browser.h"	10 #include "chrome/browser/ui/browser.h"

14 #include "chrome/browser/ui/browser_navigator.h"	11 #include "chrome/browser/ui/browser_navigator.h"

15 #include "chrome/browser/ui/browser_window.h"	12 #include "chrome/browser/ui/browser_window.h"

16 #include "chrome/browser/ui/find_bar/find_bar.h"	13 #include "chrome/browser/ui/find_bar/find_bar.h"

17 #include "chrome/browser/ui/find_bar/find_bar_controller.h"	14 #include "chrome/browser/ui/find_bar/find_bar_controller.h"

18 #include "chrome/browser/ui/find_bar/find_notification_details.h"	15 #include "chrome/browser/ui/find_bar/find_notification_details.h"

19 #include "chrome/browser/ui/find_bar/find_tab_helper.h"	16 #include "chrome/browser/ui/find_bar/find_tab_helper.h"

20 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"	17 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"

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

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

	20 #include "content/browser/renderer_host/render_view_host.h"

	21 #include "content/browser/tab_contents/tab_contents.h"

	22 #include "content/browser/tab_contents/tab_contents_view.h"

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

24 #include "ui/base/keycodes/keyboard_codes.h"	24 #include "ui/base/keycodes/keyboard_codes.h"

25	25

26 #if defined(TOOLKIT_VIEWS)	26 #if defined(TOOLKIT_VIEWS)

27 #include "chrome/browser/ui/views/find_bar_host.h"	27 #include "chrome/browser/ui/views/find_bar_host.h"

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

29 #elif defined(TOOLKIT_GTK)	29 #elif defined(TOOLKIT_GTK)

30 #include "chrome/browser/ui/gtk/slide_animator_gtk.h"	30 #include "chrome/browser/ui/gtk/slide_animator_gtk.h"

31 #elif defined(OS_MACOSX)	31 #elif defined(OS_MACOSX)

32 #include "chrome/browser/ui/cocoa/find_bar/find_bar_bridge.h"	32 #include "chrome/browser/ui/cocoa/find_bar/find_bar_bridge.h"

(...skipping 1063 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1096	1096

1097 TabContentsWrapper* tab = browser()->GetSelectedTabContentsWrapper();	1097 TabContentsWrapper* tab = browser()->GetSelectedTabContentsWrapper();

1098 int ordinal = 0;	1098 int ordinal = 0;

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

1100 EXPECT_EQ(ordinal, 1);	1100 EXPECT_EQ(ordinal, 1);

1101	1101

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

1103 tab->find_tab_helper()->StopFinding(FindBarController::kActivateSelection);	1103 tab->find_tab_helper()->StopFinding(FindBarController::kActivateSelection);

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

1105 }	1105 }

OLD	NEW