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 "base/message_loop.h" | 5 #include "base/message_loop.h" |
6 #include "chrome/browser/browser_process.h" | 6 #include "chrome/browser/browser_process.h" |
7 #include "chrome/browser/profiles/profile.h" | 7 #include "chrome/browser/profiles/profile.h" |
8 #include "chrome/browser/task_manager/task_manager.h" | 8 #include "chrome/browser/task_manager/task_manager.h" |
9 #include "chrome/browser/task_manager/task_manager_browsertest_util.h" | 9 #include "chrome/browser/task_manager/task_manager_browsertest_util.h" |
10 #include "chrome/browser/ui/browser.h" | 10 #include "chrome/browser/ui/browser.h" |
(...skipping 21 matching lines...) Expand all Loading... |
32 } | 32 } |
33 | 33 |
34 virtual void OnItemsAdded(int start, int length) OVERRIDE { | 34 virtual void OnItemsAdded(int start, int length) OVERRIDE { |
35 OnResourceChange(); | 35 OnResourceChange(); |
36 } | 36 } |
37 | 37 |
38 virtual void OnItemsRemoved(int start, int length) OVERRIDE { | 38 virtual void OnItemsRemoved(int start, int length) OVERRIDE { |
39 OnResourceChange(); | 39 OnResourceChange(); |
40 } | 40 } |
41 | 41 |
| 42 virtual void OnItemsToBeRemoved(int start, int length) OVERRIDE { |
| 43 OnResourceChange(); |
| 44 } |
| 45 |
42 private: | 46 private: |
43 void OnResourceChange() { | 47 void OnResourceChange() { |
44 if (model_->ResourceCount() == target_resource_count_) | 48 if (model_->ResourceCount() == target_resource_count_) |
45 MessageLoopForUI::current()->Quit(); | 49 MessageLoopForUI::current()->Quit(); |
46 } | 50 } |
47 | 51 |
48 const TaskManagerModel* model_; | 52 const TaskManagerModel* model_; |
49 const int target_resource_count_; | 53 const int target_resource_count_; |
50 }; | 54 }; |
51 | 55 |
(...skipping 25 matching lines...) Expand all Loading... |
77 ui_test_utils::WindowedNotificationObserver observer( | 81 ui_test_utils::WindowedNotificationObserver observer( |
78 chrome::NOTIFICATION_TASK_MANAGER_WINDOW_READY, | 82 chrome::NOTIFICATION_TASK_MANAGER_WINDOW_READY, |
79 content::Source<TaskManagerModel>(TaskManager::GetInstance()->model())); | 83 content::Source<TaskManagerModel>(TaskManager::GetInstance()->model())); |
80 browser->window()->ShowTaskManager(); | 84 browser->window()->ShowTaskManager(); |
81 observer.Wait(); | 85 observer.Wait(); |
82 #else | 86 #else |
83 browser->window()->ShowTaskManager(); | 87 browser->window()->ShowTaskManager(); |
84 #endif // defined(WEBUI_TASK_MANAGER) | 88 #endif // defined(WEBUI_TASK_MANAGER) |
85 } | 89 } |
86 | 90 |
OLD | NEW |