chrome/browser/task_manager/task_manager.cc - Issue 1922683003: Make old task manager tests work against new task manager.

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.cc

Issue 1922683003: Make old task manager tests work against new task manager. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix OSX function call namespace Created 4 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:

View side-by-side diff with in-line comments

Download patch

Index: chrome/browser/task_manager/task_manager.cc

diff --git a/chrome/browser/task_manager/task_manager.cc b/chrome/browser/task_manager/task_manager.cc

index aac13080989e4db6a831b89076776c2e9ef8f118..f3f74b23d36ad832cad455df47248b0158a5164c 100644

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

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

@@ -35,6 +35,7 @@

#include "chrome/browser/ui/browser_navigator.h"

#include "chrome/browser/ui/browser_navigator_params.h"

#include "chrome/browser/ui/user_manager.h"

+#include "chrome/common/chrome_switches.h"

#include "chrome/common/pref_names.h"

#include "chrome/common/url_constants.h"

#include "chrome/grit/generated_resources.h"

@@ -1554,6 +1555,7 @@ void TaskManager::ModelChanged() {

// static

TaskManager* TaskManager::GetInstance() {

+ CHECK(!switches::NewTaskManagerEnabled());

return base::Singleton<TaskManager>::get();

}

« no previous file with comments | « chrome/browser/prerender/prerender_browsertest.cc ('k') | chrome/browser/task_manager/task_manager_browsertest.cc » ('j') | no next file with comments »