OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 "chrome/browser/task_manager/task_manager.h" | |
6 | |
7 #include <stddef.h> | 5 #include <stddef.h> |
8 | 6 |
9 #include "base/files/file_path.h" | 7 #include "base/files/file_path.h" |
10 #include "base/macros.h" | 8 #include "base/macros.h" |
11 #include "base/strings/stringprintf.h" | 9 #include "base/strings/stringprintf.h" |
12 #include "base/strings/utf_string_conversions.h" | 10 #include "base/strings/utf_string_conversions.h" |
13 #include "build/build_config.h" | 11 #include "build/build_config.h" |
14 #include "chrome/browser/browser_process.h" | 12 #include "chrome/browser/browser_process.h" |
15 #include "chrome/browser/chrome_notification_types.h" | 13 #include "chrome/browser/chrome_notification_types.h" |
16 #include "chrome/browser/devtools/devtools_window_testing.h" | 14 #include "chrome/browser/devtools/devtools_window_testing.h" |
17 #include "chrome/browser/extensions/extension_browsertest.h" | 15 #include "chrome/browser/extensions/extension_browsertest.h" |
18 #include "chrome/browser/extensions/extension_service.h" | 16 #include "chrome/browser/extensions/extension_service.h" |
19 #include "chrome/browser/infobars/infobar_service.h" | 17 #include "chrome/browser/infobars/infobar_service.h" |
20 #include "chrome/browser/notifications/notification.h" | 18 #include "chrome/browser/notifications/notification.h" |
21 #include "chrome/browser/notifications/notification_test_util.h" | 19 #include "chrome/browser/notifications/notification_test_util.h" |
22 #include "chrome/browser/notifications/notification_ui_manager.h" | 20 #include "chrome/browser/notifications/notification_ui_manager.h" |
23 #include "chrome/browser/profiles/profile.h" | 21 #include "chrome/browser/profiles/profile.h" |
24 #include "chrome/browser/task_management/task_manager_browsertest_util.h" | 22 #include "chrome/browser/task_management/task_manager_browsertest_util.h" |
| 23 #include "chrome/browser/task_management/task_manager_interface.h" |
25 #include "chrome/browser/task_management/task_manager_tester.h" | 24 #include "chrome/browser/task_management/task_manager_tester.h" |
26 #include "chrome/browser/ui/browser.h" | 25 #include "chrome/browser/ui/browser.h" |
27 #include "chrome/browser/ui/browser_commands.h" | 26 #include "chrome/browser/ui/browser_commands.h" |
28 #include "chrome/browser/ui/browser_dialogs.h" | 27 #include "chrome/browser/ui/browser_dialogs.h" |
29 #include "chrome/browser/ui/browser_window.h" | 28 #include "chrome/browser/ui/browser_window.h" |
30 #include "chrome/browser/ui/panels/panel.h" | 29 #include "chrome/browser/ui/panels/panel.h" |
31 #include "chrome/browser/ui/panels/panel_manager.h" | 30 #include "chrome/browser/ui/panels/panel_manager.h" |
32 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 31 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
33 #include "chrome/browser/web_applications/web_app.h" | 32 #include "chrome/browser/web_applications/web_app.h" |
34 #include "chrome/common/chrome_switches.h" | 33 #include "chrome/common/chrome_switches.h" |
35 #include "chrome/grit/generated_resources.h" | 34 #include "chrome/grit/generated_resources.h" |
36 #include "chrome/test/base/in_process_browser_test.h" | 35 #include "chrome/test/base/in_process_browser_test.h" |
37 #include "chrome/test/base/ui_test_utils.h" | 36 #include "chrome/test/base/ui_test_utils.h" |
38 #include "components/infobars/core/confirm_infobar_delegate.h" | 37 #include "components/infobars/core/confirm_infobar_delegate.h" |
39 #include "components/infobars/core/infobar.h" | 38 #include "components/infobars/core/infobar.h" |
40 #include "content/public/browser/notification_service.h" | 39 #include "content/public/browser/notification_service.h" |
41 #include "content/public/browser/page_navigator.h" | 40 #include "content/public/browser/page_navigator.h" |
42 #include "content/public/browser/render_frame_host.h" | 41 #include "content/public/browser/render_frame_host.h" |
43 #include "content/public/test/browser_test_utils.h" | 42 #include "content/public/test/browser_test_utils.h" |
44 #include "content/public/test/content_browser_test_utils.h" | 43 #include "content/public/test/content_browser_test_utils.h" |
45 #include "extensions/browser/extension_system.h" | 44 #include "extensions/browser/extension_system.h" |
46 #include "extensions/common/extension.h" | 45 #include "extensions/common/extension.h" |
47 #include "net/dns/mock_host_resolver.h" | 46 #include "net/dns/mock_host_resolver.h" |
48 #include "net/test/embedded_test_server/embedded_test_server.h" | 47 #include "net/test/embedded_test_server/embedded_test_server.h" |
49 #include "testing/gtest/include/gtest/gtest.h" | 48 #include "testing/gtest/include/gtest/gtest.h" |
50 #include "ui/base/l10n/l10n_util.h" | 49 #include "ui/base/l10n/l10n_util.h" |
51 #include "ui/base/page_transition_types.h" | 50 #include "ui/base/page_transition_types.h" |
52 | 51 |
| 52 #if defined(OS_MACOSX) |
| 53 #include "chrome/browser/task_manager/task_manager.h" |
| 54 #endif // defined(OS_MACOSX) |
| 55 |
53 using content::WebContents; | 56 using content::WebContents; |
54 using task_management::browsertest_util::ColumnSpecifier; | 57 using task_management::browsertest_util::ColumnSpecifier; |
55 using task_management::browsertest_util::MatchAboutBlankTab; | 58 using task_management::browsertest_util::MatchAboutBlankTab; |
56 using task_management::browsertest_util::MatchAnyApp; | 59 using task_management::browsertest_util::MatchAnyApp; |
57 using task_management::browsertest_util::MatchAnyExtension; | 60 using task_management::browsertest_util::MatchAnyExtension; |
58 using task_management::browsertest_util::MatchAnySubframe; | 61 using task_management::browsertest_util::MatchAnySubframe; |
59 using task_management::browsertest_util::MatchAnyTab; | 62 using task_management::browsertest_util::MatchAnyTab; |
60 using task_management::browsertest_util::MatchAnyUtility; | 63 using task_management::browsertest_util::MatchAnyUtility; |
61 using task_management::browsertest_util::MatchApp; | 64 using task_management::browsertest_util::MatchApp; |
62 using task_management::browsertest_util::MatchExtension; | 65 using task_management::browsertest_util::MatchExtension; |
(...skipping 26 matching lines...) Expand all Loading... |
89 | 92 |
90 void HideTaskManager() { | 93 void HideTaskManager() { |
91 model_.reset(); | 94 model_.reset(); |
92 | 95 |
93 // Hide the task manager, and wait for it to go. | 96 // Hide the task manager, and wait for it to go. |
94 chrome::HideTaskManager(); | 97 chrome::HideTaskManager(); |
95 base::RunLoop().RunUntilIdle(); // OnWindowClosed happens asynchronously. | 98 base::RunLoop().RunUntilIdle(); // OnWindowClosed happens asynchronously. |
96 } | 99 } |
97 | 100 |
98 void Refresh() { | 101 void Refresh() { |
99 // Refresh() isn't ever needed on the new task manager. | 102 #if defined(OS_MACOSX) |
100 if (switches::NewTaskManagerEnabled()) | 103 // On Mac, the old task manager might still be used if we are not using mac |
101 return; | 104 // views. Refresh() isn't ever needed on the new task manager. |
102 TaskManager::GetInstance()->model()->Refresh(); | 105 if (!task_management::TaskManagerInterface::IsNewTaskManagerEnabled()) |
| 106 TaskManager::GetInstance()->model()->Refresh(); |
| 107 #endif // defined(OS_MACOSX) |
103 } | 108 } |
104 | 109 |
105 GURL GetTestURL() { | 110 GURL GetTestURL() { |
106 return ui_test_utils::GetTestUrl( | 111 return ui_test_utils::GetTestUrl( |
107 base::FilePath(base::FilePath::kCurrentDirectory), | 112 base::FilePath(base::FilePath::kCurrentDirectory), |
108 base::FilePath(kTitle1File)); | 113 base::FilePath(kTitle1File)); |
109 } | 114 } |
110 | 115 |
111 int FindResourceIndex(const base::string16& title) { | 116 int FindResourceIndex(const base::string16& title) { |
112 for (int i = 0; i < model_->GetRowCount(); ++i) { | 117 for (int i = 0; i < model_->GetRowCount(); ++i) { |
(...skipping 1072 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1185 WaitForTaskManagerRows(1, MatchTab("Title Of Awesomeness"))); | 1190 WaitForTaskManagerRows(1, MatchTab("Title Of Awesomeness"))); |
1186 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(0, MatchAnySubframe())); | 1191 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(0, MatchAnySubframe())); |
1187 | 1192 |
1188 HideTaskManager(); | 1193 HideTaskManager(); |
1189 ShowTaskManager(); | 1194 ShowTaskManager(); |
1190 | 1195 |
1191 ASSERT_NO_FATAL_FAILURE( | 1196 ASSERT_NO_FATAL_FAILURE( |
1192 WaitForTaskManagerRows(1, MatchTab("Title Of Awesomeness"))); | 1197 WaitForTaskManagerRows(1, MatchTab("Title Of Awesomeness"))); |
1193 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(0, MatchAnySubframe())); | 1198 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(0, MatchAnySubframe())); |
1194 } | 1199 } |
OLD | NEW |