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 <string> | 5 #include <string> |
6 | 6 |
7 #include "app/l10n_util.h" | 7 #include "app/l10n_util.h" |
8 #include "base/compiler_specific.h" | 8 #include "base/compiler_specific.h" |
9 #include "base/file_path.h" | 9 #include "base/file_path.h" |
10 #include "base/sys_info.h" | 10 #include "base/sys_info.h" |
11 #include "base/utf_string_conversions.h" | 11 #include "base/utf_string_conversions.h" |
12 #include "chrome/app/chrome_command_ids.h" | 12 #include "chrome/app/chrome_command_ids.h" |
13 #include "chrome/browser/browser_process.h" | |
14 #include "chrome/browser/defaults.h" | 13 #include "chrome/browser/defaults.h" |
15 #include "chrome/browser/extensions/extension_browsertest.h" | 14 #include "chrome/browser/extensions/extension_browsertest.h" |
16 #include "chrome/browser/extensions/extensions_service.h" | 15 #include "chrome/browser/extensions/extensions_service.h" |
17 #include "chrome/browser/profiles/profile.h" | 16 #include "chrome/browser/profiles/profile.h" |
18 #include "chrome/browser/renderer_host/render_process_host.h" | 17 #include "chrome/browser/renderer_host/render_process_host.h" |
19 #include "chrome/browser/renderer_host/render_view_host.h" | 18 #include "chrome/browser/renderer_host/render_view_host.h" |
20 #include "chrome/browser/tab_contents/tab_contents.h" | 19 #include "chrome/browser/tab_contents/tab_contents.h" |
21 #include "chrome/browser/tabs/pinned_tab_codec.h" | 20 #include "chrome/browser/tabs/pinned_tab_codec.h" |
22 #include "chrome/browser/tabs/tab_strip_model.h" | 21 #include "chrome/browser/tabs/tab_strip_model.h" |
23 #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog.h" | 22 #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog.h" |
(...skipping 10 matching lines...) Expand all Loading... | |
34 #include "chrome/common/notification_source.h" | 33 #include "chrome/common/notification_source.h" |
35 #include "chrome/common/page_transition_types.h" | 34 #include "chrome/common/page_transition_types.h" |
36 #include "chrome/common/url_constants.h" | 35 #include "chrome/common/url_constants.h" |
37 #include "chrome/test/in_process_browser_test.h" | 36 #include "chrome/test/in_process_browser_test.h" |
38 #include "chrome/test/ui_test_utils.h" | 37 #include "chrome/test/ui_test_utils.h" |
39 #include "grit/chromium_strings.h" | 38 #include "grit/chromium_strings.h" |
40 #include "grit/generated_resources.h" | 39 #include "grit/generated_resources.h" |
41 #include "net/base/mock_host_resolver.h" | 40 #include "net/base/mock_host_resolver.h" |
42 #include "net/test/test_server.h" | 41 #include "net/test/test_server.h" |
43 | 42 |
44 #if defined(OS_WIN) | 43 #if defined(OS_WIN) |
James Hawkins
2010/12/05 17:58:47
#ifdef includes are supposed to be inline with the
| |
45 #include "base/i18n/rtl.h" | 44 #include "base/i18n/rtl.h" |
45 #include "chrome/browser/browser_process.h" | |
46 #endif | 46 #endif |
47 | 47 |
48 namespace { | 48 namespace { |
49 | 49 |
50 const std::string BEFORE_UNLOAD_HTML = | 50 const std::string BEFORE_UNLOAD_HTML = |
51 "<html><head><title>beforeunload</title></head><body>" | 51 "<html><head><title>beforeunload</title></head><body>" |
52 "<script>window.onbeforeunload=function(e){return 'foo'}</script>" | 52 "<script>window.onbeforeunload=function(e){return 'foo'}</script>" |
53 "</body></html>"; | 53 "</body></html>"; |
54 | 54 |
55 const std::wstring OPEN_NEW_BEFOREUNLOAD_PAGE = | 55 const std::wstring OPEN_NEW_BEFOREUNLOAD_PAGE = |
(...skipping 623 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
679 | 679 |
680 // The normal browser should now have four. | 680 // The normal browser should now have four. |
681 EXPECT_EQ(4, browser()->tab_count()); | 681 EXPECT_EQ(4, browser()->tab_count()); |
682 | 682 |
683 // Close the additional browsers. | 683 // Close the additional browsers. |
684 popup_browser->CloseAllTabs(); | 684 popup_browser->CloseAllTabs(); |
685 app_browser->CloseAllTabs(); | 685 app_browser->CloseAllTabs(); |
686 app_popup_browser->CloseAllTabs(); | 686 app_popup_browser->CloseAllTabs(); |
687 } | 687 } |
688 #endif | 688 #endif |
OLD | NEW |