chrome/browser/task_manager/task_manager_browsertest_util.cc - Issue 10423006: Remove the web-ui task manager unused stuffs for non-ChromeOS.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 10423006: Remove the web-ui task manager unused stuffs for non-ChromeOS. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Remove "webui_task_manager" and use "use_aura" instead. Created 8 years, 7 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:

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

index 5ddd304f1701564ecf639b62076c78a7f65bf8de..06e3b3ed2d78abbb368d9334645a5e5d98746174 100644

--- a/chrome/browser/task_manager/task_manager_browsertest_util.cc

+++ b/chrome/browser/task_manager/task_manager_browsertest_util.cc

@@ -73,7 +73,7 @@ void TaskManagerBrowserTestUtil::WaitForResourceChange(int target_count) {

// static

void TaskManagerBrowserTestUtil::ShowTaskManagerAndWaitForReady(

Browser* browser) {

-#if defined(WEBUI_TASK_MANAGER)

+#if defined(USE_AURA)

ui_test_utils::WindowedNotificationObserver observer(

chrome::NOTIFICATION_TASK_MANAGER_WINDOW_READY,

content::Source<TaskManagerModel>(TaskManager::GetInstance()->model()));

@@ -81,6 +81,6 @@ void TaskManagerBrowserTestUtil::ShowTaskManagerAndWaitForReady(

observer.Wait();

#else

browser->window()->ShowTaskManager();

-#endif // defined(WEBUI_TASK_MANAGER)

+#endif // defined(USE_AURA)

}