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

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

Issue 22914008: Refactor kiosk app launch to be part of login screen UI flow. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_OOBE_UI_H_ 5 #ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_OOBE_UI_H_
6 #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_OOBE_UI_H_ 6 #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_OOBE_UI_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
11 11
12 #include "base/compiler_specific.h" 12 #include "base/compiler_specific.h"
13 #include "base/memory/ref_counted.h" 13 #include "base/memory/ref_counted.h"
14 #include "chrome/browser/chromeos/login/oobe_display.h" 14 #include "chrome/browser/chromeos/login/oobe_display.h"
15 #include "chrome/browser/ui/webui/chromeos/login/core_oobe_handler.h" 15 #include "chrome/browser/ui/webui/chromeos/login/core_oobe_handler.h"
16 #include "content/public/browser/web_ui_controller.h" 16 #include "content/public/browser/web_ui_controller.h"
17 17
18 namespace base { 18 namespace base {
19 class DictionaryValue; 19 class DictionaryValue;
20 } 20 }
21 21
22 namespace chromeos { 22 namespace chromeos {
23 class AppLaunchSplashScreenActor;
23 class BaseScreenHandler; 24 class BaseScreenHandler;
24 class CoreOobeHandler; 25 class CoreOobeHandler;
25 class ErrorScreenHandler; 26 class ErrorScreenHandler;
26 class KioskAppMenuHandler; 27 class KioskAppMenuHandler;
27 class KioskEnableScreenActor; 28 class KioskEnableScreenActor;
28 class NativeWindowDelegate; 29 class NativeWindowDelegate;
29 class NetworkDropdownHandler; 30 class NetworkDropdownHandler;
30 class NetworkStateInformer; 31 class NetworkStateInformer;
31 class SigninScreenHandler; 32 class SigninScreenHandler;
32 class SigninScreenHandlerDelegate; 33 class SigninScreenHandlerDelegate;
(...skipping 16 matching lines...) Expand all
49 static const char kScreenAccountPicker[]; 50 static const char kScreenAccountPicker[];
50 static const char kScreenKioskAutolaunch[]; 51 static const char kScreenKioskAutolaunch[];
51 static const char kScreenKioskEnable[]; 52 static const char kScreenKioskEnable[];
52 static const char kScreenErrorMessage[]; 53 static const char kScreenErrorMessage[];
53 static const char kScreenUserImagePicker[]; 54 static const char kScreenUserImagePicker[];
54 static const char kScreenTpmError[]; 55 static const char kScreenTpmError[];
55 static const char kScreenPasswordChanged[]; 56 static const char kScreenPasswordChanged[];
56 static const char kScreenManagedUserCreationFlow[]; 57 static const char kScreenManagedUserCreationFlow[];
57 static const char kScreenTermsOfService[]; 58 static const char kScreenTermsOfService[];
58 static const char kScreenWrongHWID[]; 59 static const char kScreenWrongHWID[];
60 static const char kScreenAppLaunchSplash[];
59 61
60 explicit OobeUI(content::WebUI* web_ui); 62 explicit OobeUI(content::WebUI* web_ui);
61 virtual ~OobeUI(); 63 virtual ~OobeUI();
62 64
63 // OobeDisplay implementation: 65 // OobeDisplay implementation:
64 virtual void ShowScreen(WizardScreen* screen) OVERRIDE; 66 virtual void ShowScreen(WizardScreen* screen) OVERRIDE;
65 virtual void HideScreen(WizardScreen* screen) OVERRIDE; 67 virtual void HideScreen(WizardScreen* screen) OVERRIDE;
66 virtual UpdateScreenActor* GetUpdateScreenActor() OVERRIDE; 68 virtual UpdateScreenActor* GetUpdateScreenActor() OVERRIDE;
67 virtual NetworkScreenActor* GetNetworkScreenActor() OVERRIDE; 69 virtual NetworkScreenActor* GetNetworkScreenActor() OVERRIDE;
68 virtual EulaScreenActor* GetEulaScreenActor() OVERRIDE; 70 virtual EulaScreenActor* GetEulaScreenActor() OVERRIDE;
69 virtual EnrollmentScreenActor* GetEnrollmentScreenActor() OVERRIDE; 71 virtual EnrollmentScreenActor* GetEnrollmentScreenActor() OVERRIDE;
70 virtual ResetScreenActor* GetResetScreenActor() OVERRIDE; 72 virtual ResetScreenActor* GetResetScreenActor() OVERRIDE;
71 virtual KioskAutolaunchScreenActor* GetKioskAutolaunchScreenActor() OVERRIDE; 73 virtual KioskAutolaunchScreenActor* GetKioskAutolaunchScreenActor() OVERRIDE;
72 virtual KioskEnableScreenActor* GetKioskEnableScreenActor() OVERRIDE; 74 virtual KioskEnableScreenActor* GetKioskEnableScreenActor() OVERRIDE;
73 virtual TermsOfServiceScreenActor* 75 virtual TermsOfServiceScreenActor*
74 GetTermsOfServiceScreenActor() OVERRIDE; 76 GetTermsOfServiceScreenActor() OVERRIDE;
75 virtual UserImageScreenActor* GetUserImageScreenActor() OVERRIDE; 77 virtual UserImageScreenActor* GetUserImageScreenActor() OVERRIDE;
76 virtual ErrorScreenActor* GetErrorScreenActor() OVERRIDE; 78 virtual ErrorScreenActor* GetErrorScreenActor() OVERRIDE;
77 virtual WrongHWIDScreenActor* GetWrongHWIDScreenActor() OVERRIDE; 79 virtual WrongHWIDScreenActor* GetWrongHWIDScreenActor() OVERRIDE;
78 virtual LocallyManagedUserCreationScreenHandler* 80 virtual LocallyManagedUserCreationScreenHandler*
79 GetLocallyManagedUserCreationScreenActor() OVERRIDE; 81 GetLocallyManagedUserCreationScreenActor() OVERRIDE;
82 virtual AppLaunchSplashScreenActor*
83 GetAppLaunchSplashScreenActor() OVERRIDE;
80 virtual bool IsJSReady(const base::Closure& display_is_ready_callback) 84 virtual bool IsJSReady(const base::Closure& display_is_ready_callback)
81 OVERRIDE; 85 OVERRIDE;
82 86
83 // Collects localized strings from the owned handlers. 87 // Collects localized strings from the owned handlers.
84 void GetLocalizedStrings(base::DictionaryValue* localized_strings); 88 void GetLocalizedStrings(base::DictionaryValue* localized_strings);
85 89
86 // Initializes the handlers. 90 // Initializes the handlers.
87 void InitializeHandlers(); 91 void InitializeHandlers();
88 92
89 // Shows or hides OOBE UI elements. 93 // Shows or hides OOBE UI elements.
90 void ShowOobeUI(bool show); 94 void ShowOobeUI(bool show);
91 95
92 // TODO(rkc): Create a separate retail mode login UI and move this method 96 // TODO(rkc): Create a separate retail mode login UI and move this method
93 // there - see crbug.com/157671. 97 // there - see crbug.com/157671.
94 // Shows a login spinner for retail mode logins. 98 // Shows a login spinner for retail mode logins.
95 void ShowRetailModeLoginSpinner(); 99 void ShowRetailModeLoginSpinner();
96 100
97 // Shows the signin screen. 101 // Shows the signin screen.
98 void ShowSigninScreen(SigninScreenHandlerDelegate* delegate, 102 void ShowSigninScreen(SigninScreenHandlerDelegate* delegate,
99 NativeWindowDelegate* native_window_delegate); 103 NativeWindowDelegate* native_window_delegate);
100 104
105 // Shows the kiosk splash screen.
106 void ShowAppLaunchSplashScreen();
107
101 // Resets the delegate set in ShowSigninScreen. 108 // Resets the delegate set in ShowSigninScreen.
102 void ResetSigninScreenHandlerDelegate(); 109 void ResetSigninScreenHandlerDelegate();
103 110
104 Screen current_screen() const { return current_screen_; } 111 Screen current_screen() const { return current_screen_; }
105 112
106 const std::string& GetScreenName(Screen screen) const; 113 const std::string& GetScreenName(Screen screen) const;
107 114
108 private: 115 private:
109 // Initializes |screen_ids_| and |screen_names_| structures. 116 // Initializes |screen_ids_| and |screen_names_| structures.
110 void InitializeScreenMaps(); 117 void InitializeScreenMaps();
(...skipping 18 matching lines...) Expand all
129 UpdateScreenHandler* update_screen_handler_; 136 UpdateScreenHandler* update_screen_handler_;
130 NetworkScreenActor* network_screen_actor_; 137 NetworkScreenActor* network_screen_actor_;
131 EulaScreenActor* eula_screen_actor_; 138 EulaScreenActor* eula_screen_actor_;
132 EnrollmentScreenActor* enrollment_screen_actor_; 139 EnrollmentScreenActor* enrollment_screen_actor_;
133 ResetScreenActor* reset_screen_actor_; 140 ResetScreenActor* reset_screen_actor_;
134 KioskAutolaunchScreenActor* autolaunch_screen_actor_; 141 KioskAutolaunchScreenActor* autolaunch_screen_actor_;
135 KioskEnableScreenActor* kiosk_enable_screen_actor_; 142 KioskEnableScreenActor* kiosk_enable_screen_actor_;
136 WrongHWIDScreenActor* wrong_hwid_screen_actor_; 143 WrongHWIDScreenActor* wrong_hwid_screen_actor_;
137 LocallyManagedUserCreationScreenHandler* 144 LocallyManagedUserCreationScreenHandler*
138 locally_managed_user_creation_screen_actor_; 145 locally_managed_user_creation_screen_actor_;
146 AppLaunchSplashScreenActor* app_launch_splash_screen_actor_;
139 147
140 // Reference to ErrorScreenHandler that handles error screen 148 // Reference to ErrorScreenHandler that handles error screen
141 // requests and forward calls from native code to JS side. 149 // requests and forward calls from native code to JS side.
142 ErrorScreenHandler* error_screen_handler_; 150 ErrorScreenHandler* error_screen_handler_;
143 151
144 // Reference to SigninScreenHandler that handles sign-in screen requests and 152 // Reference to SigninScreenHandler that handles sign-in screen requests and
145 // forward calls from native code to JS side. 153 // forward calls from native code to JS side.
146 SigninScreenHandler* signin_screen_handler_; 154 SigninScreenHandler* signin_screen_handler_;
147 155
148 TermsOfServiceScreenActor* terms_of_service_screen_actor_; 156 TermsOfServiceScreenActor* terms_of_service_screen_actor_;
(...skipping 18 matching lines...) Expand all
167 175
168 // Callbacks to notify when JS part is fully loaded and ready to accept calls. 176 // Callbacks to notify when JS part is fully loaded and ready to accept calls.
169 std::vector<base::Closure> ready_callbacks_; 177 std::vector<base::Closure> ready_callbacks_;
170 178
171 DISALLOW_COPY_AND_ASSIGN(OobeUI); 179 DISALLOW_COPY_AND_ASSIGN(OobeUI);
172 }; 180 };
173 181
174 } // namespace chromeos 182 } // namespace chromeos
175 183
176 #endif // CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_OOBE_UI_H_ 184 #endif // CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_OOBE_UI_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698