| 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 "base/message_loop.h" | 5 #include "base/message_loop.h" |
| 6 #include "base/stringprintf.h" | 6 #include "base/stringprintf.h" |
| 7 #include "base/utf_string_conversions.h" | 7 #include "base/utf_string_conversions.h" |
| 8 #include "chrome/browser/browser_process.h" | 8 #include "chrome/browser/browser_process.h" |
| 9 #include "chrome/browser/profiles/profile.h" | 9 #include "chrome/browser/profiles/profile.h" |
| 10 #include "chrome/browser/task_manager/task_manager.h" | 10 #include "chrome/browser/task_manager/task_manager.h" |
| (...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 93 model->RemoveObserver(&observer); | 93 model->RemoveObserver(&observer); |
| 94 } | 94 } |
| 95 | 95 |
| 96 // static | 96 // static |
| 97 void TaskManagerBrowserTestUtil::ShowTaskManagerAndWaitForReady( | 97 void TaskManagerBrowserTestUtil::ShowTaskManagerAndWaitForReady( |
| 98 Browser* browser) { | 98 Browser* browser) { |
| 99 #if defined(USE_AURA) | 99 #if defined(USE_AURA) |
| 100 content::WindowedNotificationObserver observer( | 100 content::WindowedNotificationObserver observer( |
| 101 chrome::NOTIFICATION_TASK_MANAGER_WINDOW_READY, | 101 chrome::NOTIFICATION_TASK_MANAGER_WINDOW_READY, |
| 102 content::Source<TaskManagerModel>(TaskManager::GetInstance()->model())); | 102 content::Source<TaskManagerModel>(TaskManager::GetInstance()->model())); |
| 103 browser->window()->ShowTaskManager(chrome::HOST_DESKTOP_TYPE_NATIVE); | 103 browser->window()->ShowTaskManager(); |
| 104 observer.Wait(); | 104 observer.Wait(); |
| 105 #else | 105 #else |
| 106 browser->window()->ShowTaskManager(chrome::HOST_DESKTOP_TYPE_NATIVE); | 106 browser->window()->ShowTaskManager(); |
| 107 #endif // defined(USE_AURA) | 107 #endif // defined(USE_AURA) |
| 108 } | 108 } |
| 109 | 109 |
| OLD | NEW |