Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(174)

Side by Side Diff: chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc

Issue 228553002: Preference dis/allowing supervised users creation is now available as owner setting, not only as de… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Unnecessary callback removed. Patch applied for failing tests. Created 6 years, 6 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
OLDNEW
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 309 matching lines...) Expand 10 before | Expand all | Expand 10 after
320 caps_lock_enabled_(chromeos::input_method::InputMethodManager::Get() 320 caps_lock_enabled_(chromeos::input_method::InputMethodManager::Get()
321 ->GetImeKeyboard() 321 ->GetImeKeyboard()
322 ->CapsLockIsEnabled()), 322 ->CapsLockIsEnabled()),
323 gaia_screen_handler_(gaia_screen_handler) { 323 gaia_screen_handler_(gaia_screen_handler) {
324 DCHECK(network_state_informer_.get()); 324 DCHECK(network_state_informer_.get());
325 DCHECK(error_screen_actor_); 325 DCHECK(error_screen_actor_);
326 DCHECK(core_oobe_actor_); 326 DCHECK(core_oobe_actor_);
327 DCHECK(gaia_screen_handler_); 327 DCHECK(gaia_screen_handler_);
328 gaia_screen_handler_->SetSigninScreenHandler(this); 328 gaia_screen_handler_->SetSigninScreenHandler(this);
329 network_state_informer_->AddObserver(this); 329 network_state_informer_->AddObserver(this);
330 allow_new_user_subscription_ = CrosSettings::Get()->AddSettingsObserver(
331 kAccountsPrefAllowNewUser,
332 base::Bind(&SigninScreenHandler::UserSettingsChanged,
333 base::Unretained(this)));
334 allow_guest_subscription_ = CrosSettings::Get()->AddSettingsObserver(
335 kAccountsPrefAllowGuest,
336 base::Bind(&SigninScreenHandler::UserSettingsChanged,
337 base::Unretained(this)));
338 330
339 registrar_.Add(this, 331 registrar_.Add(this,
340 chrome::NOTIFICATION_AUTH_NEEDED, 332 chrome::NOTIFICATION_AUTH_NEEDED,
341 content::NotificationService::AllSources()); 333 content::NotificationService::AllSources());
342 registrar_.Add(this, 334 registrar_.Add(this,
343 chrome::NOTIFICATION_AUTH_SUPPLIED, 335 chrome::NOTIFICATION_AUTH_SUPPLIED,
344 content::NotificationService::AllSources()); 336 content::NotificationService::AllSources());
345 registrar_.Add(this, 337 registrar_.Add(this,
346 chrome::NOTIFICATION_AUTH_CANCELLED, 338 chrome::NOTIFICATION_AUTH_CANCELLED,
347 content::NotificationService::AllSources()); 339 content::NotificationService::AllSources());
(...skipping 1476 matching lines...) Expand 10 before | Expand all | Expand 10 after
1824 return gaia_screen_handler_->frame_error(); 1816 return gaia_screen_handler_->frame_error();
1825 } 1817 }
1826 1818
1827 void SigninScreenHandler::OnCapsLockChanged(bool enabled) { 1819 void SigninScreenHandler::OnCapsLockChanged(bool enabled) {
1828 caps_lock_enabled_ = enabled; 1820 caps_lock_enabled_ = enabled;
1829 if (page_is_ready()) 1821 if (page_is_ready())
1830 CallJS("login.AccountPickerScreen.setCapsLockState", caps_lock_enabled_); 1822 CallJS("login.AccountPickerScreen.setCapsLockState", caps_lock_enabled_);
1831 } 1823 }
1832 1824
1833 } // namespace chromeos 1825 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698