chrome/browser/ui/search_engines/keyword_editor_controller.cc - Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/.

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

Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Address review comments, merge to LKGR. 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 unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « chrome/browser/ui/prefs/prefs_tab_helper_browsertest.cc ('k') | chrome/browser/ui/startup/autolaunch_prompt_win.cc » ('j') | no next file with comments »

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

6	6

	7 #include "base/prefs/pref_registry_simple.h"

7 #include "base/utf_string_conversions.h"	8 #include "base/utf_string_conversions.h"

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

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

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

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

12 #include "chrome/browser/search_engines/template_url_service_factory.h"	12 #include "chrome/browser/search_engines/template_url_service_factory.h"

13 #include "chrome/browser/ui/search_engines/template_url_table_model.h"	13 #include "chrome/browser/ui/search_engines/template_url_table_model.h"

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

15 #include "content/public/browser/user_metrics.h"	15 #include "content/public/browser/user_metrics.h"

16	16

17 using content::UserMetricsAction;	17 using content::UserMetricsAction;

18	18

(...skipping 79 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
98 return url_model()->loaded();	98 return url_model()->loaded();

99 }	99 }

100	100

101 TemplateURL* KeywordEditorController::GetTemplateURL(int index) {	101 TemplateURL* KeywordEditorController::GetTemplateURL(int index) {

102 return table_model_->GetTemplateURL(index);	102 return table_model_->GetTemplateURL(index);

103 }	103 }

104	104

105 TemplateURLService* KeywordEditorController::url_model() const {	105 TemplateURLService* KeywordEditorController::url_model() const {

106 return table_model_->template_url_service();	106 return table_model_->template_url_service();

107 }	107 }

OLD	NEW