chrome/browser/ui/search_engines/keyword_editor_controller.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/ui/search_engines/keyword_editor_controller.cc

Issue 11741003: Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix double registration in Chrome Frame test. Created 7 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/search_engines/keyword_editor_controller.h ('k') | chrome/browser/ui/tab_contents/tab_contents_iterator_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/search_engines/keyword_editor_controller.cc

diff --git a/chrome/browser/ui/search_engines/keyword_editor_controller.cc b/chrome/browser/ui/search_engines/keyword_editor_controller.cc

index 592c1255594362e1cbd9abf58f158d1fc4b459eb..30d91e900de5d59553fbad10108c9122c6215ee8 100644

--- a/chrome/browser/ui/search_engines/keyword_editor_controller.cc

+++ b/chrome/browser/ui/search_engines/keyword_editor_controller.cc

@@ -5,7 +5,7 @@

#include "chrome/browser/ui/search_engines/keyword_editor_controller.h"

#include "base/utf_string_conversions.h"

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

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

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

#include "chrome/browser/search_engines/template_url.h"

#include "chrome/browser/search_engines/template_url_service.h"

@@ -28,8 +28,8 @@ KeywordEditorController::~KeywordEditorController() {

// static

// TODO(rsesek): Other platforms besides Mac should remember window

// placement. http://crbug.com/22269

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

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

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

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

}

int KeywordEditorController::AddTemplateURL(const string16& title,