chrome/browser/task_manager/task_manager.cc - Issue 11741003: Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple.

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 11741003: Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Address review comments. Fix Clang build and fix bug shown by trybots. Created 7 years, 11 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

« chrome/browser/signin/signin_manager_factory.cc ('K') | « chrome/browser/task_manager/task_manager.h ('k') | chrome/browser/ui/browser_ui_prefs.h » ('j') | chrome/browser/ui/browser_view_prefs.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 f888dc09291fd7c8fa6d5d22fbb86b1345a6b4d3..674d5cfb5c5fb878c12d3311e43b5392079dba2f 100644

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

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

@@ -21,6 +21,7 @@

#include "chrome/browser/extensions/extension_host.h"

#include "chrome/browser/extensions/extension_process_manager.h"

#include "chrome/browser/extensions/extension_system.h"

+#include "chrome/browser/prefs/pref_registry_simple.h"

#include "chrome/browser/prefs/pref_service.h"

Mattias Nissler (ping if slow) 2013/01/31 14:50:45 needed?

Jói 2013/01/31 16:23:37 Done.

#include "chrome/browser/profiles/profile_manager.h"

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

@@ -1388,8 +1389,8 @@ content::WebContents* TaskManager::Resource::GetWebContents() const {

bool TaskManager::Resource::IsBackground() const { return false; }

// static

-void TaskManager::RegisterPrefs(PrefServiceSimple* prefs) {

- prefs->RegisterDictionaryPref(prefs::kTaskManagerWindowPlacement);

+void TaskManager::RegisterPrefs(PrefRegistrySimple* registry) {

+ registry->RegisterDictionaryPref(prefs::kTaskManagerWindowPlacement);

}

bool TaskManager::IsBrowserProcess(int index) const {