chrome/browser/browser_focus_uitest.cc - Issue 5089001: Cleanup: Include browser.h -> ui/browser.h [Part 3].

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

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

Patch Set: Fixes. 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/browser_about_handler.cc ('k') | chrome/browser/bug_report_data.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 "build/build_config.h"	5 #include "build/build_config.h"

6	6

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

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

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

10 #include "base/path_service.h"	10 #include "base/path_service.h"

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

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

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

14 #include "chrome/browser/browser_window.h"	13 #include "chrome/browser/browser_window.h"

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

16 #include "chrome/browser/renderer_host/render_widget_host_view.h"	15 #include "chrome/browser/renderer_host/render_widget_host_view.h"

17 #include "chrome/browser/tab_contents/interstitial_page.h"	16 #include "chrome/browser/tab_contents/interstitial_page.h"

18 #include "chrome/browser/tab_contents/tab_contents.h"	17 #include "chrome/browser/tab_contents/tab_contents.h"

19 #include "chrome/browser/tab_contents/tab_contents_view.h"	18 #include "chrome/browser/tab_contents/tab_contents_view.h"

20 #include "chrome/browser/tabs/tab_strip_model.h"	19 #include "chrome/browser/tabs/tab_strip_model.h"

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

21 #include "chrome/browser/view_ids.h"	21 #include "chrome/browser/view_ids.h"

22 #include "chrome/common/chrome_paths.h"	22 #include "chrome/common/chrome_paths.h"

23 #include "chrome/common/url_constants.h"	23 #include "chrome/common/url_constants.h"

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

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

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

27	27

28 #if defined(TOOLKIT_VIEWS) \|\| defined(OS_WIN)	28 #if defined(TOOLKIT_VIEWS) \|\| defined(OS_WIN)

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

30 #include "views/view.h"	30 #include "views/view.h"

(...skipping 742 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
773 ui_test_utils::CrashTab(browser()->GetSelectedTabContents());	773 ui_test_utils::CrashTab(browser()->GetSelectedTabContents());

774 browser()->Reload(CURRENT_TAB);	774 browser()->Reload(CURRENT_TAB);

775 ASSERT_TRUE(ui_test_utils::WaitForNavigationInCurrentTab(browser()));	775 ASSERT_TRUE(ui_test_utils::WaitForNavigationInCurrentTab(browser()));

776	776

777 // Focus should now be on the tab contents.	777 // Focus should now be on the tab contents.

778 browser()->ShowDownloadsTab();	778 browser()->ShowDownloadsTab();

779 ASSERT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER_FOCUS_VIEW));	779 ASSERT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER_FOCUS_VIEW));

780 }	780 }

781	781

782 } // namespace	782 } // namespace

OLD	NEW