OLD | NEW |
---|---|
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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/chromeos/login/signin_screen_handler.h" | 5 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/bind_helpers.h" | 10 #include "base/bind_helpers.h" |
(...skipping 310 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
321 gaia_screen_handler_->SetSigninScreenHandler(this); | 321 gaia_screen_handler_->SetSigninScreenHandler(this); |
322 network_state_informer_->AddObserver(this); | 322 network_state_informer_->AddObserver(this); |
323 allow_new_user_subscription_ = CrosSettings::Get()->AddSettingsObserver( | 323 allow_new_user_subscription_ = CrosSettings::Get()->AddSettingsObserver( |
324 kAccountsPrefAllowNewUser, | 324 kAccountsPrefAllowNewUser, |
325 base::Bind(&SigninScreenHandler::UserSettingsChanged, | 325 base::Bind(&SigninScreenHandler::UserSettingsChanged, |
326 base::Unretained(this))); | 326 base::Unretained(this))); |
327 allow_guest_subscription_ = CrosSettings::Get()->AddSettingsObserver( | 327 allow_guest_subscription_ = CrosSettings::Get()->AddSettingsObserver( |
328 kAccountsPrefAllowGuest, | 328 kAccountsPrefAllowGuest, |
329 base::Bind(&SigninScreenHandler::UserSettingsChanged, | 329 base::Bind(&SigninScreenHandler::UserSettingsChanged, |
330 base::Unretained(this))); | 330 base::Unretained(this))); |
331 allow_supervised_subscription_ = CrosSettings::Get()->AddSettingsObserver( | |
332 kAccountsPrefSupervisedUsersEnabled, | |
333 base::Bind(&SigninScreenHandler::UserSettingsChanged, | |
Nikita (slow)
2014/04/08 14:02:09
nit: Please double check the code that changing th
merkulova
2014/04/09 15:24:19
Removed as discussed offline because we have dupli
| |
334 base::Unretained(this))); | |
331 | 335 |
332 registrar_.Add(this, | 336 registrar_.Add(this, |
333 chrome::NOTIFICATION_AUTH_NEEDED, | 337 chrome::NOTIFICATION_AUTH_NEEDED, |
334 content::NotificationService::AllSources()); | 338 content::NotificationService::AllSources()); |
335 registrar_.Add(this, | 339 registrar_.Add(this, |
336 chrome::NOTIFICATION_AUTH_SUPPLIED, | 340 chrome::NOTIFICATION_AUTH_SUPPLIED, |
337 content::NotificationService::AllSources()); | 341 content::NotificationService::AllSources()); |
338 registrar_.Add(this, | 342 registrar_.Add(this, |
339 chrome::NOTIFICATION_AUTH_CANCELLED, | 343 chrome::NOTIFICATION_AUTH_CANCELLED, |
340 content::NotificationService::AllSources()); | 344 content::NotificationService::AllSources()); |
(...skipping 1450 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1791 DCHECK(gaia_screen_handler_); | 1795 DCHECK(gaia_screen_handler_); |
1792 return gaia_screen_handler_->frame_state(); | 1796 return gaia_screen_handler_->frame_state(); |
1793 } | 1797 } |
1794 | 1798 |
1795 net::Error SigninScreenHandler::FrameError() const { | 1799 net::Error SigninScreenHandler::FrameError() const { |
1796 DCHECK(gaia_screen_handler_); | 1800 DCHECK(gaia_screen_handler_); |
1797 return gaia_screen_handler_->frame_error(); | 1801 return gaia_screen_handler_->frame_error(); |
1798 } | 1802 } |
1799 | 1803 |
1800 } // namespace chromeos | 1804 } // namespace chromeos |
OLD | NEW |