Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3277)

Unified Diff: chrome/browser/task_manager/task_manager_browsertest_util.cc

Issue 7550004: WebUI TaskManager: make it default on Chrome OS (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Move the initializing of observer before the loading. Created 9 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/task_manager/task_manager_browsertest_util.cc
diff --git a/chrome/browser/task_manager/task_manager_browsertest_util.cc b/chrome/browser/task_manager/task_manager_browsertest_util.cc
new file mode 100644
index 0000000000000000000000000000000000000000..c0e6d757478003ee5973a35c581d5d3784b1a909
--- /dev/null
+++ b/chrome/browser/task_manager/task_manager_browsertest_util.cc
@@ -0,0 +1,79 @@
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "base/message_loop.h"
+#include "chrome/browser/browser_process.h"
+#include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/task_manager/task_manager.h"
+#include "chrome/browser/task_manager/task_manager_browsertest_util.h"
+#include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_window.h"
+#include "chrome/common/chrome_notification_types.h"
+#include "chrome/test/base/ui_test_utils.h"
+#include "content/common/notification_source.h"
+
+namespace {
+
+class ResourceChangeObserver : public TaskManagerModelObserver {
+ public:
+ ResourceChangeObserver(const TaskManagerModel* model,
+ int target_resource_count)
+ : model_(model),
+ target_resource_count_(target_resource_count) {
+ }
+
+ virtual void OnModelChanged() OVERRIDE {
+ OnResourceChange();
+ }
+
+ virtual void OnItemsChanged(int start, int length) OVERRIDE {
+ OnResourceChange();
+ }
+
+ virtual void OnItemsAdded(int start, int length) OVERRIDE {
+ OnResourceChange();
+ }
+
+ virtual void OnItemsRemoved(int start, int length) OVERRIDE {
+ OnResourceChange();
+ }
+
+ private:
+ void OnResourceChange() {
+ if (model_->ResourceCount() == target_resource_count_)
+ MessageLoopForUI::current()->Quit();
+ }
+
+ const TaskManagerModel* model_;
+ const int target_resource_count_;
+};
+
+} // namespace
+
+// static
+void TaskManagerBrowserTestUtil::WaitForResourceChange(int target_count) {
+ TaskManagerModel* model = TaskManager::GetInstance()->model();
+
+ if (model->ResourceCount() == target_count)
+ return;
+ ResourceChangeObserver observer(model, target_count);
+ model->AddObserver(&observer);
+ ui_test_utils::RunMessageLoop();
+ model->RemoveObserver(&observer);
+}
+
+// static
+void TaskManagerBrowserTestUtil::ShowTaskManagerAndWaitForReady(
+ Browser* browser) {
+#if defined(WEBUI_TASK_MANAGER)
+ ui_test_utils::WindowedNotificationObserver observer(
+ chrome::NOTIFICATION_TASK_MANAGER_WINDOW_READY,
+ Source<TaskManagerModel>(TaskManager::GetInstance()->model()));
+ browser->window()->ShowTaskManager();
+ observer.Wait();
+#else
+ browser->window()->ShowTaskManager();
+#endif // defined(WEBUI_TASK_MANAGER)
+}
+
« no previous file with comments | « chrome/browser/task_manager/task_manager_browsertest_util.h ('k') | chrome/browser/ui/views/frame/browser_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698