chrome/browser/task_manager.cc - Issue 24011: chrome_resources take 2

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

Issue 24011: chrome_resources take 2 (Closed)

Patch Set: rebase Created 11 years, 10 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

« no previous file with comments | « chrome/browser/tab_contents/navigation_entry.h ('k') | chrome/browser/task_manager_resource_providers.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2006-2008 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 "chrome/browser/task_manager.h"	5 #include "chrome/browser/task_manager.h"

6	6

7 #include "base/process_util.h"	7 #include "base/process_util.h"

8 #include "base/stats_table.h"	8 #include "base/stats_table.h"

9 #include "base/string_util.h"	9 #include "base/string_util.h"

10 #include "base/thread.h"	10 #include "base/thread.h"

11 #include "chrome/app/theme/theme_resources.h"	11 #include "grit/theme_resources.h"

12 #include "chrome/browser/browser_list.h"	12 #include "chrome/browser/browser_list.h"

13 #include "chrome/browser/browser_process.h"	13 #include "chrome/browser/browser_process.h"

14 #include "chrome/browser/renderer_host/render_process_host.h"	14 #include "chrome/browser/renderer_host/render_process_host.h"

15 #include "chrome/browser/task_manager_resource_providers.h"	15 #include "chrome/browser/task_manager_resource_providers.h"

16 #include "chrome/browser/tab_contents/tab_util.h"	16 #include "chrome/browser/tab_contents/tab_util.h"

17 #include "chrome/browser/views/standard_layout.h"	17 #include "chrome/browser/views/standard_layout.h"

18 #include "chrome/common/l10n_util.h"	18 #include "chrome/common/l10n_util.h"

19 #include "chrome/common/pref_names.h"	19 #include "chrome/common/pref_names.h"

20 #include "chrome/common/pref_service.h"	20 #include "chrome/common/pref_service.h"

21 #include "chrome/common/resource_bundle.h"	21 #include "chrome/common/resource_bundle.h"

(...skipping 1070 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1092	1092

1093 views::View* TaskManager::GetContentsView() {	1093 views::View* TaskManager::GetContentsView() {

1094 return contents_.get();	1094 return contents_.get();

1095 }	1095 }

1096	1096

1097 // static	1097 // static

1098 TaskManager* TaskManager::GetInstance() {	1098 TaskManager* TaskManager::GetInstance() {

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

1100 }	1100 }

1101	1101

OLD	NEW