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 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: Fixed broken browser tests. 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 289 matching lines...) Expand 10 before | Expand all | Expand 10 after
300 keyboard->AddObserver(this); 300 keyboard->AddObserver(this);
301 301
302 max_mode_delegate_.reset(new TouchViewControllerDelegate()); 302 max_mode_delegate_.reset(new TouchViewControllerDelegate());
303 max_mode_delegate_->AddObserver(this); 303 max_mode_delegate_->AddObserver(this);
304 304
305 policy::ConsumerManagementService* consumer_management = 305 policy::ConsumerManagementService* consumer_management =
306 g_browser_process->platform_part()->browser_policy_connector_chromeos()-> 306 g_browser_process->platform_part()->browser_policy_connector_chromeos()->
307 GetConsumerManagementService(); 307 GetConsumerManagementService();
308 is_enrolling_consumer_management_ = 308 is_enrolling_consumer_management_ =
309 consumer_management && 309 consumer_management &&
310 consumer_management->GetEnrollmentState() == 310 consumer_management->GetEnrollmentStage() ==
311 policy::ConsumerManagementService::ENROLLMENT_REQUESTED; 311 policy::ConsumerManagementService::ENROLLMENT_STAGE_REQUESTED;
312 } 312 }
313 313
314 SigninScreenHandler::~SigninScreenHandler() { 314 SigninScreenHandler::~SigninScreenHandler() {
315 chromeos::input_method::ImeKeyboard* keyboard = 315 chromeos::input_method::ImeKeyboard* keyboard =
316 chromeos::input_method::InputMethodManager::Get()->GetImeKeyboard(); 316 chromeos::input_method::InputMethodManager::Get()->GetImeKeyboard();
317 if (keyboard) 317 if (keyboard)
318 keyboard->RemoveObserver(this); 318 keyboard->RemoveObserver(this);
319 weak_factory_.InvalidateWeakPtrs(); 319 weak_factory_.InvalidateWeakPtrs();
320 if (delegate_) 320 if (delegate_)
321 delegate_->SetWebUIHandler(NULL); 321 delegate_->SetWebUIHandler(NULL);
(...skipping 1048 matching lines...) Expand 10 before | Expand all | Expand 10 after
1370 specifics.kiosk_diagnostic_mode = diagnostic_mode; 1370 specifics.kiosk_diagnostic_mode = diagnostic_mode;
1371 if (delegate_) 1371 if (delegate_)
1372 delegate_->Login(context, specifics); 1372 delegate_->Login(context, specifics);
1373 } 1373 }
1374 1374
1375 void SigninScreenHandler::HandleCancelConsumerManagementEnrollment() { 1375 void SigninScreenHandler::HandleCancelConsumerManagementEnrollment() {
1376 policy::ConsumerManagementService* consumer_management = 1376 policy::ConsumerManagementService* consumer_management =
1377 g_browser_process->platform_part()->browser_policy_connector_chromeos()-> 1377 g_browser_process->platform_part()->browser_policy_connector_chromeos()->
1378 GetConsumerManagementService(); 1378 GetConsumerManagementService();
1379 CHECK(consumer_management); 1379 CHECK(consumer_management);
1380 consumer_management->SetEnrollmentState( 1380 consumer_management->SetEnrollmentStage(
1381 policy::ConsumerManagementService::ENROLLMENT_CANCELED); 1381 policy::ConsumerManagementService::ENROLLMENT_STAGE_CANCELED);
1382 is_enrolling_consumer_management_ = false; 1382 is_enrolling_consumer_management_ = false;
1383 ShowImpl(); 1383 ShowImpl();
1384 } 1384 }
1385 1385
1386 void SigninScreenHandler::HandleGetTouchViewState() { 1386 void SigninScreenHandler::HandleGetTouchViewState() {
1387 CallJS("login.AccountPickerScreen.setTouchViewState", 1387 CallJS("login.AccountPickerScreen.setTouchViewState",
1388 max_mode_delegate_->IsMaximizeModeEnabled()); 1388 max_mode_delegate_->IsMaximizeModeEnabled());
1389 } 1389 }
1390 1390
1391 bool SigninScreenHandler::AllWhitelistedUsersPresent() { 1391 bool SigninScreenHandler::AllWhitelistedUsersPresent() {
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
1506 return gaia_screen_handler_->frame_error(); 1506 return gaia_screen_handler_->frame_error();
1507 } 1507 }
1508 1508
1509 void SigninScreenHandler::OnCapsLockChanged(bool enabled) { 1509 void SigninScreenHandler::OnCapsLockChanged(bool enabled) {
1510 caps_lock_enabled_ = enabled; 1510 caps_lock_enabled_ = enabled;
1511 if (page_is_ready()) 1511 if (page_is_ready())
1512 CallJS("login.AccountPickerScreen.setCapsLockState", caps_lock_enabled_); 1512 CallJS("login.AccountPickerScreen.setCapsLockState", caps_lock_enabled_);
1513 } 1513 }
1514 1514
1515 } // namespace chromeos 1515 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698