OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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" | 5 #include "chrome/browser/task_manager/task_manager.h" |
6 | 6 |
7 #include "base/files/file_path.h" | 7 #include "base/files/file_path.h" |
8 #include "base/strings/stringprintf.h" | 8 #include "base/strings/stringprintf.h" |
9 #include "base/strings/utf_string_conversions.h" | 9 #include "base/strings/utf_string_conversions.h" |
10 #include "chrome/browser/browser_process.h" | 10 #include "chrome/browser/browser_process.h" |
(...skipping 13 matching lines...) Expand all Loading... |
24 #include "chrome/browser/task_manager/task_manager_browsertest_util.h" | 24 #include "chrome/browser/task_manager/task_manager_browsertest_util.h" |
25 #include "chrome/browser/ui/browser.h" | 25 #include "chrome/browser/ui/browser.h" |
26 #include "chrome/browser/ui/browser_dialogs.h" | 26 #include "chrome/browser/ui/browser_dialogs.h" |
27 #include "chrome/browser/ui/browser_navigator.h" | 27 #include "chrome/browser/ui/browser_navigator.h" |
28 #include "chrome/browser/ui/browser_window.h" | 28 #include "chrome/browser/ui/browser_window.h" |
29 #include "chrome/browser/ui/panels/panel.h" | 29 #include "chrome/browser/ui/panels/panel.h" |
30 #include "chrome/browser/ui/panels/panel_manager.h" | 30 #include "chrome/browser/ui/panels/panel_manager.h" |
31 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 31 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
32 #include "chrome/browser/web_applications/web_app.h" | 32 #include "chrome/browser/web_applications/web_app.h" |
33 #include "chrome/common/chrome_switches.h" | 33 #include "chrome/common/chrome_switches.h" |
34 #include "chrome/common/extensions/extension.h" | |
35 #include "chrome/test/base/in_process_browser_test.h" | 34 #include "chrome/test/base/in_process_browser_test.h" |
36 #include "chrome/test/base/ui_test_utils.h" | 35 #include "chrome/test/base/ui_test_utils.h" |
37 #include "content/public/browser/notification_service.h" | 36 #include "content/public/browser/notification_service.h" |
38 #include "content/public/common/content_switches.h" | 37 #include "content/public/common/content_switches.h" |
39 #include "content/public/common/page_transition_types.h" | 38 #include "content/public/common/page_transition_types.h" |
40 #include "content/public/test/browser_test_utils.h" | 39 #include "content/public/test/browser_test_utils.h" |
| 40 #include "extensions/common/extension.h" |
41 #include "grit/generated_resources.h" | 41 #include "grit/generated_resources.h" |
42 #include "net/dns/mock_host_resolver.h" | 42 #include "net/dns/mock_host_resolver.h" |
43 #include "net/test/embedded_test_server/embedded_test_server.h" | 43 #include "net/test/embedded_test_server/embedded_test_server.h" |
44 #include "testing/gtest/include/gtest/gtest.h" | 44 #include "testing/gtest/include/gtest/gtest.h" |
45 #include "ui/base/l10n/l10n_util.h" | 45 #include "ui/base/l10n/l10n_util.h" |
46 | 46 |
47 // http://crbug.com/31663 | 47 // http://crbug.com/31663 |
48 // TODO(linux_aura) http://crbug.com/163931 | 48 // TODO(linux_aura) http://crbug.com/163931 |
49 #if !(defined(OS_WIN) && defined(USE_AURA)) && !(defined(OS_LINUX) && !defined(O
S_CHROMEOS) && defined(USE_AURA)) | 49 #if !(defined(OS_WIN) && defined(USE_AURA)) && !(defined(OS_LINUX) && !defined(O
S_CHROMEOS) && defined(USE_AURA)) |
50 | 50 |
(...skipping 489 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
540 // Now add showing the task manager to the queue, and watch for the right | 540 // Now add showing the task manager to the queue, and watch for the right |
541 // number of reources to show up. | 541 // number of reources to show up. |
542 base::MessageLoop::current()->PostTask( | 542 base::MessageLoop::current()->PostTask( |
543 FROM_HERE, | 543 FROM_HERE, |
544 base::Bind(&TaskManagerNoShowBrowserTest::ShowTaskManager, | 544 base::Bind(&TaskManagerNoShowBrowserTest::ShowTaskManager, |
545 base::Unretained(this))); | 545 base::Unretained(this))); |
546 TaskManagerBrowserTestUtil::WaitForWebResourceChange(2); | 546 TaskManagerBrowserTestUtil::WaitForWebResourceChange(2); |
547 } | 547 } |
548 | 548 |
549 #endif | 549 #endif |
OLD | NEW |