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

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

Issue 542623002: Minimal support for OOBE/login for chrome-athena (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: comments resolved 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 281 matching lines...) Expand 10 before | Expand all | Expand 10 after
292 content::NotificationService::AllSources()); 292 content::NotificationService::AllSources());
293 registrar_.Add(this, 293 registrar_.Add(this,
294 chrome::NOTIFICATION_AUTH_CANCELLED, 294 chrome::NOTIFICATION_AUTH_CANCELLED,
295 content::NotificationService::AllSources()); 295 content::NotificationService::AllSources());
296 296
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 #if !defined(USE_ATHENA)
302 max_mode_delegate_.reset(new TouchViewControllerDelegate()); 303 max_mode_delegate_.reset(new TouchViewControllerDelegate());
303 max_mode_delegate_->AddObserver(this); 304 max_mode_delegate_->AddObserver(this);
305 #endif
304 306
305 policy::ConsumerManagementService* consumer_management = 307 policy::ConsumerManagementService* consumer_management =
306 g_browser_process->platform_part()->browser_policy_connector_chromeos()-> 308 g_browser_process->platform_part()->browser_policy_connector_chromeos()->
307 GetConsumerManagementService(); 309 GetConsumerManagementService();
308 is_enrolling_consumer_management_ = 310 is_enrolling_consumer_management_ =
309 consumer_management && 311 consumer_management &&
310 consumer_management->GetEnrollmentState() == 312 consumer_management->GetEnrollmentState() ==
311 policy::ConsumerManagementService::ENROLLMENT_REQUESTED; 313 policy::ConsumerManagementService::ENROLLMENT_REQUESTED;
312 } 314 }
313 315
314 SigninScreenHandler::~SigninScreenHandler() { 316 SigninScreenHandler::~SigninScreenHandler() {
315 chromeos::input_method::ImeKeyboard* keyboard = 317 chromeos::input_method::ImeKeyboard* keyboard =
316 chromeos::input_method::InputMethodManager::Get()->GetImeKeyboard(); 318 chromeos::input_method::InputMethodManager::Get()->GetImeKeyboard();
317 if (keyboard) 319 if (keyboard)
318 keyboard->RemoveObserver(this); 320 keyboard->RemoveObserver(this);
319 weak_factory_.InvalidateWeakPtrs(); 321 weak_factory_.InvalidateWeakPtrs();
320 if (delegate_) 322 if (delegate_)
321 delegate_->SetWebUIHandler(NULL); 323 delegate_->SetWebUIHandler(NULL);
322 network_state_informer_->RemoveObserver(this); 324 network_state_informer_->RemoveObserver(this);
323 max_mode_delegate_->RemoveObserver(this); 325 if (max_mode_delegate_) {
324 max_mode_delegate_.reset(NULL); 326 max_mode_delegate_->RemoveObserver(this);
327 max_mode_delegate_.reset(NULL);
328 }
325 ScreenlockBridge::Get()->SetLockHandler(NULL); 329 ScreenlockBridge::Get()->SetLockHandler(NULL);
326 } 330 }
327 331
328 void SigninScreenHandler::DeclareLocalizedValues( 332 void SigninScreenHandler::DeclareLocalizedValues(
329 LocalizedValuesBuilder* builder) { 333 LocalizedValuesBuilder* builder) {
330 builder->Add("passwordHint", IDS_LOGIN_POD_EMPTY_PASSWORD_TEXT); 334 builder->Add("passwordHint", IDS_LOGIN_POD_EMPTY_PASSWORD_TEXT);
331 builder->Add("podMenuButtonAccessibleName", 335 builder->Add("podMenuButtonAccessibleName",
332 IDS_LOGIN_POD_MENU_BUTTON_ACCESSIBLE_NAME); 336 IDS_LOGIN_POD_MENU_BUTTON_ACCESSIBLE_NAME);
333 builder->Add("podMenuRemoveItemAccessibleName", 337 builder->Add("podMenuRemoveItemAccessibleName",
334 IDS_LOGIN_POD_MENU_REMOVE_ITEM_ACCESSIBLE_NAME); 338 IDS_LOGIN_POD_MENU_REMOVE_ITEM_ACCESSIBLE_NAME);
(...skipping 1042 matching lines...) Expand 10 before | Expand all | Expand 10 after
1377 g_browser_process->platform_part()->browser_policy_connector_chromeos()-> 1381 g_browser_process->platform_part()->browser_policy_connector_chromeos()->
1378 GetConsumerManagementService(); 1382 GetConsumerManagementService();
1379 CHECK(consumer_management); 1383 CHECK(consumer_management);
1380 consumer_management->SetEnrollmentState( 1384 consumer_management->SetEnrollmentState(
1381 policy::ConsumerManagementService::ENROLLMENT_CANCELED); 1385 policy::ConsumerManagementService::ENROLLMENT_CANCELED);
1382 is_enrolling_consumer_management_ = false; 1386 is_enrolling_consumer_management_ = false;
1383 ShowImpl(); 1387 ShowImpl();
1384 } 1388 }
1385 1389
1386 void SigninScreenHandler::HandleGetTouchViewState() { 1390 void SigninScreenHandler::HandleGetTouchViewState() {
1387 CallJS("login.AccountPickerScreen.setTouchViewState", 1391 if (max_mode_delegate_) {
1388 max_mode_delegate_->IsMaximizeModeEnabled()); 1392 CallJS("login.AccountPickerScreen.setTouchViewState",
1393 max_mode_delegate_->IsMaximizeModeEnabled());
1394 }
1389 } 1395 }
1390 1396
1391 bool SigninScreenHandler::AllWhitelistedUsersPresent() { 1397 bool SigninScreenHandler::AllWhitelistedUsersPresent() {
1392 CrosSettings* cros_settings = CrosSettings::Get(); 1398 CrosSettings* cros_settings = CrosSettings::Get();
1393 bool allow_new_user = false; 1399 bool allow_new_user = false;
1394 cros_settings->GetBoolean(kAccountsPrefAllowNewUser, &allow_new_user); 1400 cros_settings->GetBoolean(kAccountsPrefAllowNewUser, &allow_new_user);
1395 if (allow_new_user) 1401 if (allow_new_user)
1396 return false; 1402 return false;
1397 user_manager::UserManager* user_manager = user_manager::UserManager::Get(); 1403 user_manager::UserManager* user_manager = user_manager::UserManager::Get();
1398 const user_manager::UserList& users = user_manager->GetUsers(); 1404 const user_manager::UserList& users = user_manager->GetUsers();
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
1506 return gaia_screen_handler_->frame_error(); 1512 return gaia_screen_handler_->frame_error();
1507 } 1513 }
1508 1514
1509 void SigninScreenHandler::OnCapsLockChanged(bool enabled) { 1515 void SigninScreenHandler::OnCapsLockChanged(bool enabled) {
1510 caps_lock_enabled_ = enabled; 1516 caps_lock_enabled_ = enabled;
1511 if (page_is_ready()) 1517 if (page_is_ready())
1512 CallJS("login.AccountPickerScreen.setCapsLockState", caps_lock_enabled_); 1518 CallJS("login.AccountPickerScreen.setCapsLockState", caps_lock_enabled_);
1513 } 1519 }
1514 1520
1515 } // namespace chromeos 1521 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698