chrome/browser/chromeos/login/oobe_screen.cc - Issue 2649103006: arc: Add splash screen for ARC++ Kiosk startup

Side by Side Diff: chrome/browser/chromeos/login/oobe_screen.cc

Issue 2649103006: arc: Add splash screen for ARC++ Kiosk startup (Closed)

Patch Set: use base::Bind for timer start Created 3 years, 10 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:

« chrome/browser/chromeos/login/arc_kiosk_controller.cc ('K') | « chrome/browser/chromeos/login/oobe_screen.h ('k') | chrome/browser/chromeos/login/screens/arc_kiosk_splash_screen_actor.h » ('j') | chrome/browser/chromeos/login/screens/arc_kiosk_splash_screen_actor.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2016 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2016 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/chromeos/login/oobe_screen.h"	5 #include "chrome/browser/chromeos/login/oobe_screen.h"

6	6

7 #include "base/logging.h"	7 #include "base/logging.h"

8 #include "base/macros.h"	8 #include "base/macros.h"

9	9

10 namespace chromeos {	10 namespace chromeos {

(...skipping 16 matching lines...) Expand all Loading...
27 "error-message", // SCREEN_ERROR_MESSAGE	27 "error-message", // SCREEN_ERROR_MESSAGE

28 "user-image", // SCREEN_USER_IMAGE_PICKER	28 "user-image", // SCREEN_USER_IMAGE_PICKER

29 "tpm-error-message", // SCREEN_TPM_ERROR	29 "tpm-error-message", // SCREEN_TPM_ERROR

30 "password-changed", // SCREEN_PASSWORD_CHANGED	30 "password-changed", // SCREEN_PASSWORD_CHANGED

31 "supervised-user-creation", // SCREEN_CREATE_SUPERVISED_USER_FLOW	31 "supervised-user-creation", // SCREEN_CREATE_SUPERVISED_USER_FLOW

32 "terms-of-service", // SCREEN_TERMS_OF_SERVICE	32 "terms-of-service", // SCREEN_TERMS_OF_SERVICE

33 "arc-tos", // SCREEN_ARC_TERMS_OF_SERVICE	33 "arc-tos", // SCREEN_ARC_TERMS_OF_SERVICE

34 "wrong-hwid", // SCREEN_WRONG_HWID	34 "wrong-hwid", // SCREEN_WRONG_HWID

35 "auto-enrollment-check", // SCREEN_AUTO_ENROLLMENT_CHECK	35 "auto-enrollment-check", // SCREEN_AUTO_ENROLLMENT_CHECK

36 "app-launch-splash", // SCREEN_APP_LAUNCH_SPLASH	36 "app-launch-splash", // SCREEN_APP_LAUNCH_SPLASH

	37 "arc-kiosk-splash", // SCREEN_ARC_KIOSK_SPLASH

37 "confirm-password", // SCREEN_CONFIRM_PASSWORD	38 "confirm-password", // SCREEN_CONFIRM_PASSWORD

38 "fatal-error", // SCREEN_FATAL_ERROR	39 "fatal-error", // SCREEN_FATAL_ERROR

39 "controller-pairing", // SCREEN_OOBE_CONTROLLER_PAIRING	40 "controller-pairing", // SCREEN_OOBE_CONTROLLER_PAIRING

40 "host-pairing", // SCREEN_OOBE_HOST_PAIRING	41 "host-pairing", // SCREEN_OOBE_HOST_PAIRING

41 "device-disabled", // SCREEN_DEVICE_DISABLED	42 "device-disabled", // SCREEN_DEVICE_DISABLED

42 "unrecoverable-cryptohome-error", // SCREEN_UNRECOVERABLE_CRYPTOHOME_ERROR	43 "unrecoverable-cryptohome-error", // SCREEN_UNRECOVERABLE_CRYPTOHOME_ERROR

43 "userBoard", // SCREEN_USER_SELECTION	44 "userBoard", // SCREEN_USER_SELECTION

44 // SCREEN_ACTIVE_DIRECTORY_PASSWORD_CHANGE	45 // SCREEN_ACTIVE_DIRECTORY_PASSWORD_CHANGE

45 "ad-password-change",	46 "ad-password-change",

46 "login", // SCREEN_SPECIAL_LOGIN	47 "login", // SCREEN_SPECIAL_LOGIN
	achuithb 2017/02/03 00:35:00 Why change this Why change this Sergey Poromov 2017/02/03 15:15:36 Oops, looks like presubmit checks did it. Will try Show quoted text On 2017/02/03 00:35:00, achuithb wrote: > Why change this Oops, looks like presubmit checks did it. Will try to avoid it.
47 "oobe", // SCREEN_SPECIAL_OOBE	48 "oobe", // SCREEN_SPECIAL_OOBE

48 "test:nowindow", // SCREEN_TEST_NO_WINDOW	49 "test:nowindow", // SCREEN_TEST_NO_WINDOW

49 "unknown", // SCREEN_UNKNOWN	50 "unknown", // SCREEN_UNKNOWN

50 };	51 };

51	52

52 static_assert(static_cast<size_t>(OobeScreen::SCREEN_UNKNOWN) ==	53 static_assert(static_cast<size_t>(OobeScreen::SCREEN_UNKNOWN) ==

53 arraysize(kScreenNames) - 1,	54 arraysize(kScreenNames) - 1,

54 "Missing element in OobeScreen or kScreenNames");	55 "Missing element in OobeScreen or kScreenNames");

55	56

56 } // namespace	57 } // namespace

57	58

58 std::string GetOobeScreenName(OobeScreen screen) {	59 std::string GetOobeScreenName(OobeScreen screen) {

59 DCHECK(screen <= OobeScreen::SCREEN_UNKNOWN);	60 DCHECK(screen <= OobeScreen::SCREEN_UNKNOWN);

60 return kScreenNames[static_cast<size_t>(screen)];	61 return kScreenNames[static_cast<size_t>(screen)];

61 }	62 }

62	63

63 OobeScreen GetOobeScreenFromName(const std::string& name) {	64 OobeScreen GetOobeScreenFromName(const std::string& name) {

64 for (size_t i = 0; i < arraysize(kScreenNames); ++i) {	65 for (size_t i = 0; i < arraysize(kScreenNames); ++i) {

65 if (name == kScreenNames[i])	66 if (name == kScreenNames[i])

66 return static_cast<OobeScreen>(i);	67 return static_cast<OobeScreen>(i);

67 }	68 }

68	69

69 return OobeScreen::SCREEN_UNKNOWN;	70 return OobeScreen::SCREEN_UNKNOWN;

70 }	71 }

71	72

72 } // namespace chromeos	73 } // namespace chromeos

OLD	NEW