Index: chrome/browser/ui/webui/options/browser_options_handler.cc |
diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc |
index 28ee1eedd818ea542bfba8cc6e046715ce9b5fbd..49b1445f6977b9ba69ae1de92ddfc81ce875ee37 100644 |
--- a/chrome/browser/ui/webui/options/browser_options_handler.cc |
+++ b/chrome/browser/ui/webui/options/browser_options_handler.cc |
@@ -143,6 +143,7 @@ BrowserOptionsHandler::~BrowserOptionsHandler() { |
if (sync_service) |
sync_service->RemoveObserver(this); |
+ profile_pref_registrar_.RemoveAll(); |
if (default_browser_worker_.get()) |
default_browser_worker_->ObserverDestroyed(); |
if (template_url_service_) |
@@ -580,6 +581,13 @@ void BrowserOptionsHandler::OnStateChanged() { |
SendProfilesInfo(); |
} |
+void BrowserOptionsHandler::OnSigninAllowedPrefChange() { |
+ web_ui()->CallJavascriptFunction("BrowserOptions.updateSyncState", |
+ *GetSyncStateDictionary()); |
+ |
+ SendProfilesInfo(); |
+} |
+ |
void BrowserOptionsHandler::PageLoadStarted() { |
page_initialized_ = false; |
} |
@@ -650,9 +658,12 @@ void BrowserOptionsHandler::InitializeHandler() { |
prefs::kDefaultZoomLevel, prefs, |
base::Bind(&BrowserOptionsHandler::SetupPageZoomSelector, |
base::Unretained(this))); |
+ profile_pref_registrar_.Init(prefs); |
+ profile_pref_registrar_.Add(prefs::kSigninAllowed, |
+ base::Bind(&BrowserOptionsHandler::OnSigninAllowedPrefChange, |
+ base::Unretained(this))); |
#if !defined(OS_CHROMEOS) |
- proxy_prefs_.Init(prefs); |
- proxy_prefs_.Add(prefs::kProxy, |
+ profile_pref_registrar_.Add(prefs::kProxy, |
base::Bind(&BrowserOptionsHandler::SetupProxySettingsSection, |
Andrew T Wilson (Slow)
2013/02/07 15:05:30
Indent is off here now.
Adrian Kuegel
2013/02/07 16:08:59
Done.
|
base::Unretained(this))); |
#endif // !defined(OS_CHROMEOS) |
@@ -1072,14 +1083,17 @@ void BrowserOptionsHandler::UpdateAccountPicture() { |
scoped_ptr<DictionaryValue> BrowserOptionsHandler::GetSyncStateDictionary() { |
scoped_ptr<DictionaryValue> sync_status(new DictionaryValue); |
Profile* profile = Profile::FromWebUI(web_ui()); |
- sync_status->SetBoolean("signinAllowed", !profile->IsGuestSession()); |
if (profile->IsGuestSession()) { |
// Cannot display signin status when running in guest mode on chromeos |
// because there is no SigninManager. |
+ sync_status->SetBoolean("signinAllowed", false); |
return sync_status.Pass(); |
} |
ProfileSyncService* service( |
ProfileSyncServiceFactory::GetInstance()->GetForProfile(profile)); |
+ SigninManager* signin(SigninManagerFactory::GetForProfile(profile)); |
+ DCHECK(signin); |
+ sync_status->SetBoolean("signinAllowed", signin->IsSigninAllowed()); |
sync_status->SetBoolean("syncSystemEnabled", !!service); |
sync_status->SetBoolean("setupCompleted", |
service && service->HasSyncSetupCompleted()); |
@@ -1088,8 +1102,6 @@ scoped_ptr<DictionaryValue> BrowserOptionsHandler::GetSyncStateDictionary() { |
string16 status_label; |
string16 link_label; |
- SigninManager* signin = SigninManagerFactory::GetForProfile(profile); |
- DCHECK(signin); |
bool status_has_error = sync_ui_util::GetStatusLabels( |
service, *signin, sync_ui_util::WITH_HTML, &status_label, &link_label) == |
sync_ui_util::SYNC_ERROR; |
@@ -1423,7 +1435,7 @@ void BrowserOptionsHandler::SetupProxySettingsSection() { |
bool is_extension_controlled = (proxy_config && |
proxy_config->IsExtensionControlled()); |
- base::FundamentalValue disabled(proxy_prefs_.IsManaged() || |
+ base::FundamentalValue disabled(profile_pref_registrar_.IsManaged() || |
is_extension_controlled); |
base::FundamentalValue extension_controlled(is_extension_controlled); |
web_ui()->CallJavascriptFunction("BrowserOptions.setupProxySettingsSection", |