chrome/browser/browser_browsertest.cc - Issue 6672070: Move the remaining files in chrome\common to content\common.

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

Issue 6672070: Move the remaining files in chrome\common to content\common. (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/automation/testing_automation_provider.h ('k') | chrome/browser/browser_main.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 <string>	5 #include <string>

6	6

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

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

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

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

11 #include "chrome/app/chrome_command_ids.h"	11 #include "chrome/app/chrome_command_ids.h"

12 #include "chrome/browser/defaults.h"	12 #include "chrome/browser/defaults.h"

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

14 #include "chrome/browser/extensions/extension_service.h"	14 #include "chrome/browser/extensions/extension_service.h"

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

16 #include "chrome/browser/tabs/pinned_tab_codec.h"	16 #include "chrome/browser/tabs/pinned_tab_codec.h"

17 #include "chrome/browser/tabs/tab_strip_model.h"	17 #include "chrome/browser/tabs/tab_strip_model.h"

18 #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog.h"	18 #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog.h"

19 #include "chrome/browser/ui/app_modal_dialogs/js_modal_dialog.h"	19 #include "chrome/browser/ui/app_modal_dialogs/js_modal_dialog.h"

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

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

22 #include "chrome/browser/ui/browser_init.h"	22 #include "chrome/browser/ui/browser_init.h"

23 #include "chrome/browser/ui/browser_list.h"	23 #include "chrome/browser/ui/browser_list.h"

24 #include "chrome/browser/ui/browser_navigator.h"	24 #include "chrome/browser/ui/browser_navigator.h"

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

26 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"	26 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"

27 #include "chrome/common/chrome_switches.h"	27 #include "chrome/common/chrome_switches.h"

28 #include "chrome/common/extensions/extension.h"	28 #include "chrome/common/extensions/extension.h"

29 #include "chrome/common/page_transition_types.h"

30 #include "chrome/common/url_constants.h"	29 #include "chrome/common/url_constants.h"

31 #include "chrome/test/in_process_browser_test.h"	30 #include "chrome/test/in_process_browser_test.h"

32 #include "chrome/test/ui_test_utils.h"	31 #include "chrome/test/ui_test_utils.h"

33 #include "content/browser/renderer_host/render_process_host.h"	32 #include "content/browser/renderer_host/render_process_host.h"

34 #include "content/browser/renderer_host/render_view_host.h"	33 #include "content/browser/renderer_host/render_view_host.h"

35 #include "content/browser/tab_contents/tab_contents.h"	34 #include "content/browser/tab_contents/tab_contents.h"

36 #include "content/common/notification_source.h"	35 #include "content/common/notification_source.h"

	36 #include "content/common/page_transition_types.h"

37 #include "grit/chromium_strings.h"	37 #include "grit/chromium_strings.h"

38 #include "grit/generated_resources.h"	38 #include "grit/generated_resources.h"

39 #include "net/base/mock_host_resolver.h"	39 #include "net/base/mock_host_resolver.h"

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

41 #include "ui/base/l10n/l10n_util.h"	41 #include "ui/base/l10n/l10n_util.h"

42	42

43 #if defined(OS_WIN)	43 #if defined(OS_WIN)

44 #include "base/i18n/rtl.h"	44 #include "base/i18n/rtl.h"

45 #include "chrome/browser/browser_process.h"	45 #include "chrome/browser/browser_process.h"

46 #endif	46 #endif

(...skipping 751 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
798	798

799 // The normal browser should now have four.	799 // The normal browser should now have four.

800 EXPECT_EQ(4, browser()->tab_count());	800 EXPECT_EQ(4, browser()->tab_count());

801	801

802 // Close the additional browsers.	802 // Close the additional browsers.

803 popup_browser->CloseAllTabs();	803 popup_browser->CloseAllTabs();

804 app_browser->CloseAllTabs();	804 app_browser->CloseAllTabs();

805 app_popup_browser->CloseAllTabs();	805 app_popup_browser->CloseAllTabs();

806 }	806 }

807 #endif	807 #endif

OLD	NEW