chrome/browser/task_manager/task_manager_browsertest_util.cc - Issue 7541070: Merge 95567 - WebUI TaskManager: make it default on Chrome OS

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: chrome/browser/task_manager/task_manager_browsertest_util.cc

Issue 7541070: Merge 95567 - WebUI TaskManager: make it default on Chrome OS (Closed) Base URL: svn://svn.chromium.org/chrome/branches/835/src/

Patch Set: Created 9 years, 4 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 unified diff | Download patch | Annotate | Revision Log

« 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 »

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 59 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
70 ui_test_utils::WindowedNotificationObserver observer(	70 ui_test_utils::WindowedNotificationObserver observer(

71 chrome::NOTIFICATION_TASK_MANAGER_WINDOW_READY,	71 chrome::NOTIFICATION_TASK_MANAGER_WINDOW_READY,

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

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

74 observer.Wait();	74 observer.Wait();

75 #else	75 #else

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

77 #endif // defined(WEBUI_TASK_MANAGER)	77 #endif // defined(WEBUI_TASK_MANAGER)

78 }	78 }

79	79

OLD	NEW