chrome/browser/net/pref_proxy_config_service.cc - Issue 6905044: Refactor preference syncing.

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/net/pref_proxy_config_service.cc

Issue 6905044: Refactor preference syncing. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase + comments Created 9 years, 7 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/net/predictor_api.cc ('k') | chrome/browser/net/ssl_config_service_manager_pref.cc » ('j') | chrome/browser/prefs/pref_service.h » ('J')

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

6	6

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

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

9 #include "chrome/browser/prefs/pref_set_observer.h"	9 #include "chrome/browser/prefs/pref_set_observer.h"

10 #include "chrome/browser/prefs/proxy_config_dictionary.h"	10 #include "chrome/browser/prefs/proxy_config_dictionary.h"

(...skipping 251 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
262 if (!registered_observers_) {	262 if (!registered_observers_) {

263 base_service_->AddObserver(this);	263 base_service_->AddObserver(this);

264 pref_config_tracker_->AddObserver(this);	264 pref_config_tracker_->AddObserver(this);

265 registered_observers_ = true;	265 registered_observers_ = true;

266 }	266 }

267 }	267 }

268	268

269 // static	269 // static

270 void PrefProxyConfigService::RegisterPrefs(PrefService* pref_service) {	270 void PrefProxyConfigService::RegisterPrefs(PrefService* pref_service) {

271 DictionaryValue* default_settings = ProxyConfigDictionary::CreateSystem();	271 DictionaryValue* default_settings = ProxyConfigDictionary::CreateSystem();

272 pref_service->RegisterDictionaryPref(prefs::kProxy, default_settings);	272 pref_service->RegisterDictionaryPref(prefs::kProxy,

	273 default_settings,

	274 false /* don't sync pref */);

273 }	275 }

OLD	NEW