chrome/browser/ui/webui/instant_ui.cc - Issue 11570009: Split PrefService into PrefService, PrefServiceSimple and PrefServiceSyncable.

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/webui/instant_ui.cc

Issue 11570009: Split PrefService into PrefService, PrefServiceSimple and PrefServiceSyncable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Merge to head again, previous had unrelated broken win_rel test. Created 8 years 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/webui/instant_ui.h ('k') | chrome/browser/ui/webui/ntp/android/promo_handler.h » ('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/webui/instant_ui.h"	5 #include "chrome/browser/ui/webui/instant_ui.h"

6	6

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

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

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

10 #include "chrome/browser/ui/webui/chrome_web_ui_data_source.h"	10 #include "chrome/browser/ui/webui/chrome_web_ui_data_source.h"

(...skipping 84 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
95	95

96 InstantUI::InstantUI(content::WebUI* web_ui) : WebUIController(web_ui) {	96 InstantUI::InstantUI(content::WebUI* web_ui) : WebUIController(web_ui) {

97 web_ui->AddMessageHandler(new InstantUIMessageHandler());	97 web_ui->AddMessageHandler(new InstantUIMessageHandler());

98	98

99 // Set up the chrome://instant/ source.	99 // Set up the chrome://instant/ source.

100 Profile* profile = Profile::FromWebUI(web_ui);	100 Profile* profile = Profile::FromWebUI(web_ui);

101 ChromeURLDataManager::AddDataSource(profile, CreateInstantHTMLSource());	101 ChromeURLDataManager::AddDataSource(profile, CreateInstantHTMLSource());

102 }	102 }

103	103

104 // static	104 // static

105 void InstantUI::RegisterUserPrefs(PrefService* user_prefs) {	105 void InstantUI::RegisterUserPrefs(PrefServiceSyncable* user_prefs) {

106 user_prefs->RegisterStringPref(prefs::kInstantUIZeroSuggestUrlPrefix, "",	106 user_prefs->RegisterStringPref(prefs::kInstantUIZeroSuggestUrlPrefix, "",

107 PrefService::UNSYNCABLE_PREF);	107 PrefServiceSyncable::UNSYNCABLE_PREF);

108 }	108 }

OLD	NEW