chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc - Issue 11316163: Remove the last usages of PrefObserver outside of Prefs.

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/webui/options/chromeos/core_chromeos_options_handler.cc

Issue 11316163: Remove the last usages of PrefObserver outside of Prefs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix build. 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 side-by-side diff with in-line comments

Download patch

« chrome/browser/profiles/profile_io_data.cc ('K') | « chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.h ('k') | chrome/browser/ui/webui/options/clear_browser_data_handler.cc » ('j') | chrome/browser/ui/webui/options/core_options_handler.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc

diff --git a/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc

index 4c337674a1f417124d0beacef2a05c8d6ce33c25..1fd2058dfca93fe480bd2ad490d291735f41d534 100644

--- a/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc

+++ b/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc

@@ -102,8 +102,12 @@ CoreChromeOSOptionsHandler::~CoreChromeOSOptionsHandler() {

void CoreChromeOSOptionsHandler::InitializeHandler() {

CoreOptionsHandler::InitializeHandler();

- proxy_prefs_.Init(Profile::FromWebUI(web_ui())->GetPrefs());

- proxy_prefs_.Add(prefs::kProxy, this);

+ PrefService* prefs = Profile::FromWebUI(web_ui())->GetPrefs();

+ proxy_prefs_.Init(prefs);

+ proxy_prefs_.Add(prefs::kProxy,

+ base::Bind(&CoreChromeOSOptionsHandler::OnPreferenceChanged,

+ base::Unretained(this),

+ prefs));

// Observe the chromeos::ProxyConfigServiceImpl for changes from the UI.

PrefProxyConfigTracker* proxy_tracker =

Profile::FromWebUI(web_ui())->GetProxyConfigTracker();