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

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

Issue 493613002: Add an enrolling state for consumer management section in settings page. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@dn
Patch Set: Created 6 years, 3 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
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 #include <vector> 8 #include <vector>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after
297 chromeos::input_method::ImeKeyboard* keyboard = 297 chromeos::input_method::ImeKeyboard* keyboard =
298 chromeos::input_method::InputMethodManager::Get()->GetImeKeyboard(); 298 chromeos::input_method::InputMethodManager::Get()->GetImeKeyboard();
299 if (keyboard) 299 if (keyboard)
300 keyboard->AddObserver(this); 300 keyboard->AddObserver(this);
301 301
302 policy::ConsumerManagementService* consumer_management = 302 policy::ConsumerManagementService* consumer_management =
303 g_browser_process->platform_part()->browser_policy_connector_chromeos()-> 303 g_browser_process->platform_part()->browser_policy_connector_chromeos()->
304 GetConsumerManagementService(); 304 GetConsumerManagementService();
305 is_enrolling_consumer_management_ = 305 is_enrolling_consumer_management_ =
306 consumer_management && 306 consumer_management &&
307 consumer_management->GetEnrollmentState() == 307 consumer_management->GetEnrollmentStage() ==
308 policy::ConsumerManagementService::ENROLLMENT_REQUESTED; 308 policy::ConsumerManagementService::ENROLLMENT_STAGE_REQUESTED;
309 } 309 }
310 310
311 SigninScreenHandler::~SigninScreenHandler() { 311 SigninScreenHandler::~SigninScreenHandler() {
312 chromeos::input_method::ImeKeyboard* keyboard = 312 chromeos::input_method::ImeKeyboard* keyboard =
313 chromeos::input_method::InputMethodManager::Get()->GetImeKeyboard(); 313 chromeos::input_method::InputMethodManager::Get()->GetImeKeyboard();
314 if (keyboard) 314 if (keyboard)
315 keyboard->RemoveObserver(this); 315 keyboard->RemoveObserver(this);
316 weak_factory_.InvalidateWeakPtrs(); 316 weak_factory_.InvalidateWeakPtrs();
317 if (delegate_) 317 if (delegate_)
318 delegate_->SetWebUIHandler(NULL); 318 delegate_->SetWebUIHandler(NULL);
(...skipping 1036 matching lines...) Expand 10 before | Expand all | Expand 10 after
1355 specifics.kiosk_diagnostic_mode = diagnostic_mode; 1355 specifics.kiosk_diagnostic_mode = diagnostic_mode;
1356 if (delegate_) 1356 if (delegate_)
1357 delegate_->Login(context, specifics); 1357 delegate_->Login(context, specifics);
1358 } 1358 }
1359 1359
1360 void SigninScreenHandler::HandleCancelConsumerManagementEnrollment() { 1360 void SigninScreenHandler::HandleCancelConsumerManagementEnrollment() {
1361 policy::ConsumerManagementService* consumer_management = 1361 policy::ConsumerManagementService* consumer_management =
1362 g_browser_process->platform_part()->browser_policy_connector_chromeos()-> 1362 g_browser_process->platform_part()->browser_policy_connector_chromeos()->
1363 GetConsumerManagementService(); 1363 GetConsumerManagementService();
1364 CHECK(consumer_management); 1364 CHECK(consumer_management);
1365 consumer_management->SetEnrollmentState( 1365 consumer_management->SetEnrollmentStage(
1366 policy::ConsumerManagementService::ENROLLMENT_CANCELED); 1366 policy::ConsumerManagementService::ENROLLMENT_STAGE_CANCELED);
1367 is_enrolling_consumer_management_ = false; 1367 is_enrolling_consumer_management_ = false;
1368 ShowImpl(); 1368 ShowImpl();
1369 } 1369 }
1370 1370
1371 bool SigninScreenHandler::AllWhitelistedUsersPresent() { 1371 bool SigninScreenHandler::AllWhitelistedUsersPresent() {
1372 CrosSettings* cros_settings = CrosSettings::Get(); 1372 CrosSettings* cros_settings = CrosSettings::Get();
1373 bool allow_new_user = false; 1373 bool allow_new_user = false;
1374 cros_settings->GetBoolean(kAccountsPrefAllowNewUser, &allow_new_user); 1374 cros_settings->GetBoolean(kAccountsPrefAllowNewUser, &allow_new_user);
1375 if (allow_new_user) 1375 if (allow_new_user)
1376 return false; 1376 return false;
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
1486 return gaia_screen_handler_->frame_error(); 1486 return gaia_screen_handler_->frame_error();
1487 } 1487 }
1488 1488
1489 void SigninScreenHandler::OnCapsLockChanged(bool enabled) { 1489 void SigninScreenHandler::OnCapsLockChanged(bool enabled) {
1490 caps_lock_enabled_ = enabled; 1490 caps_lock_enabled_ = enabled;
1491 if (page_is_ready()) 1491 if (page_is_ready())
1492 CallJS("login.AccountPickerScreen.setCapsLockState", caps_lock_enabled_); 1492 CallJS("login.AccountPickerScreen.setCapsLockState", caps_lock_enabled_);
1493 } 1493 }
1494 1494
1495 } // namespace chromeos 1495 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698