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

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

Issue 446743003: Hook up new API for easy unlock to update lock screen (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: v Created 6 years, 4 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.
dzhioev (left Google) 2014/08/12 19:36:09 Sorry for silly question, but isn't "easy unlock"
xiyuan 2014/08/12 19:44:42 Think SigninScreenHandler is used for the webui lo
dzhioev (left Google) 2014/08/13 15:43:19 Yes, I missed that.
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 #ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_SIGNIN_SCREEN_HANDLER_H_ 5 #ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_SIGNIN_SCREEN_HANDLER_H_
6 #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_SIGNIN_SCREEN_HANDLER_H_ 6 #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_SIGNIN_SCREEN_HANDLER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
11 11
(...skipping 293 matching lines...) Expand 10 before | Expand all | Expand 10 after
305 scoped_ptr<base::ListValue> locales, 305 scoped_ptr<base::ListValue> locales,
306 const std::string& default_locale, 306 const std::string& default_locale,
307 bool multipleRecommendedLocales) OVERRIDE; 307 bool multipleRecommendedLocales) OVERRIDE;
308 308
309 // content::NotificationObserver implementation: 309 // content::NotificationObserver implementation:
310 virtual void Observe(int type, 310 virtual void Observe(int type,
311 const content::NotificationSource& source, 311 const content::NotificationSource& source,
312 const content::NotificationDetails& details) OVERRIDE; 312 const content::NotificationDetails& details) OVERRIDE;
313 313
314 // ScreenlockBridge::LockHandler implementation: 314 // ScreenlockBridge::LockHandler implementation:
315 virtual void ShowBannerMessage(const std::string& message) OVERRIDE; 315 virtual void ShowBannerMessage(const base::string16& message) OVERRIDE;
316 virtual void ShowUserPodCustomIcon(const std::string& username, 316 virtual void ShowUserPodCustomIcon(
317 const gfx::Image& icon) OVERRIDE; 317 const std::string& username,
318 const ScreenlockBridge::UserPodCustomIconOptions& icon) OVERRIDE;
318 virtual void HideUserPodCustomIcon(const std::string& username) OVERRIDE; 319 virtual void HideUserPodCustomIcon(const std::string& username) OVERRIDE;
319 virtual void EnableInput() OVERRIDE; 320 virtual void EnableInput() OVERRIDE;
320 virtual void SetAuthType(const std::string& username, 321 virtual void SetAuthType(const std::string& username,
321 ScreenlockBridge::LockHandler::AuthType auth_type, 322 ScreenlockBridge::LockHandler::AuthType auth_type,
322 const std::string& initial_value) OVERRIDE; 323 const base::string16& initial_value) OVERRIDE;
323 virtual ScreenlockBridge::LockHandler::AuthType GetAuthType( 324 virtual ScreenlockBridge::LockHandler::AuthType GetAuthType(
324 const std::string& username) const OVERRIDE; 325 const std::string& username) const OVERRIDE;
325 virtual void Unlock(const std::string& user_email) OVERRIDE; 326 virtual void Unlock(const std::string& user_email) OVERRIDE;
326 327
327 // Updates authentication extension. Called when device settings that affect 328 // Updates authentication extension. Called when device settings that affect
328 // sign-in (allow BWSI and allow whitelist) are changed. 329 // sign-in (allow BWSI and allow whitelist) are changed.
329 void UserSettingsChanged(); 330 void UserSettingsChanged();
330 void UpdateAddButtonStatus(); 331 void UpdateAddButtonStatus();
331 332
332 // Restore input focus to current user pod. 333 // Restore input focus to current user pod.
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
473 bool has_pending_auth_ui_; 474 bool has_pending_auth_ui_;
474 475
475 scoped_ptr<AutoEnrollmentController::ProgressCallbackList::Subscription> 476 scoped_ptr<AutoEnrollmentController::ProgressCallbackList::Subscription>
476 auto_enrollment_progress_subscription_; 477 auto_enrollment_progress_subscription_;
477 478
478 bool caps_lock_enabled_; 479 bool caps_lock_enabled_;
479 480
480 base::Closure kiosk_enable_flow_aborted_callback_for_test_; 481 base::Closure kiosk_enable_flow_aborted_callback_for_test_;
481 482
482 // Non-owning ptr. 483 // Non-owning ptr.
483 // TODO (ygorshenin@): remove this dependency. 484 // TODO(ygorshenin@): remove this dependency.
484 GaiaScreenHandler* gaia_screen_handler_; 485 GaiaScreenHandler* gaia_screen_handler_;
485 486
486 // Helper that retrieves the authenticated user's e-mail address. 487 // Helper that retrieves the authenticated user's e-mail address.
487 scoped_ptr<AuthenticatedUserEmailRetriever> email_retriever_; 488 scoped_ptr<AuthenticatedUserEmailRetriever> email_retriever_;
488 489
489 // Whether consumer management enrollment is in progress. 490 // Whether consumer management enrollment is in progress.
490 bool is_enrolling_consumer_management_; 491 bool is_enrolling_consumer_management_;
491 492
492 base::WeakPtrFactory<SigninScreenHandler> weak_factory_; 493 base::WeakPtrFactory<SigninScreenHandler> weak_factory_;
493 494
494 DISALLOW_COPY_AND_ASSIGN(SigninScreenHandler); 495 DISALLOW_COPY_AND_ASSIGN(SigninScreenHandler);
495 }; 496 };
496 497
497 } // namespace chromeos 498 } // namespace chromeos
498 499
499 #endif // CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_SIGNIN_SCREEN_HANDLER_H_ 500 #endif // CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_SIGNIN_SCREEN_HANDLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698