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

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

Issue 2649103006: arc: Add splash screen for ARC++ Kiosk startup (Closed)
Patch Set: Created 3 years, 11 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_CHROMEOS_LOGIN_UI_LOGIN_DISPLAY_HOST_IMPL_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_UI_LOGIN_DISPLAY_HOST_IMPL_H_
6 #define CHROME_BROWSER_CHROMEOS_LOGIN_UI_LOGIN_DISPLAY_HOST_IMPL_H_ 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_UI_LOGIN_DISPLAY_HOST_IMPL_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory> 10 #include <memory>
11 #include <string> 11 #include <string>
12 #include <vector> 12 #include <vector>
13 13
14 #include "ash/common/shell_observer.h" 14 #include "ash/common/shell_observer.h"
15 #include "base/macros.h" 15 #include "base/macros.h"
16 #include "base/memory/weak_ptr.h" 16 #include "base/memory/weak_ptr.h"
17 #include "chrome/browser/chromeos/login/app_launch_controller.h" 17 #include "chrome/browser/chromeos/login/app_launch_controller.h"
18 #include "chrome/browser/chromeos/login/arc_kiosk_controller.h"
Luis Héctor Chávez 2017/01/24 18:40:24 nit: remove and fwd-declare ArcKioskController
Sergey Poromov 2017/01/25 14:29:22 Done.
18 #include "chrome/browser/chromeos/login/auth/auth_prewarmer.h" 19 #include "chrome/browser/chromeos/login/auth/auth_prewarmer.h"
19 #include "chrome/browser/chromeos/login/existing_user_controller.h" 20 #include "chrome/browser/chromeos/login/existing_user_controller.h"
20 #include "chrome/browser/chromeos/login/signin_screen_controller.h" 21 #include "chrome/browser/chromeos/login/signin_screen_controller.h"
21 #include "chrome/browser/chromeos/login/ui/login_display.h" 22 #include "chrome/browser/chromeos/login/ui/login_display.h"
22 #include "chrome/browser/chromeos/login/ui/login_display_host.h" 23 #include "chrome/browser/chromeos/login/ui/login_display_host.h"
23 #include "chrome/browser/chromeos/login/wizard_controller.h" 24 #include "chrome/browser/chromeos/login/wizard_controller.h"
24 #include "chrome/browser/chromeos/settings/device_settings_service.h" 25 #include "chrome/browser/chromeos/settings/device_settings_service.h"
25 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h" 26 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h"
26 #include "chromeos/audio/cras_audio_handler.h" 27 #include "chromeos/audio/cras_audio_handler.h"
27 #include "chromeos/dbus/session_manager_client.h" 28 #include "chromeos/dbus/session_manager_client.h"
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 void StartUserAdding(const base::Closure& completion_callback) override; 78 void StartUserAdding(const base::Closure& completion_callback) override;
78 void CancelUserAdding() override; 79 void CancelUserAdding() override;
79 void StartSignInScreen(const LoginScreenContext& context) override; 80 void StartSignInScreen(const LoginScreenContext& context) override;
80 void OnPreferencesChanged() override; 81 void OnPreferencesChanged() override;
81 void PrewarmAuthentication() override; 82 void PrewarmAuthentication() override;
82 void StartAppLaunch( 83 void StartAppLaunch(
83 const std::string& app_id, 84 const std::string& app_id,
84 bool diagnostic_mode, 85 bool diagnostic_mode,
85 bool auto_launch) override; 86 bool auto_launch) override;
86 void StartDemoAppLaunch() override; 87 void StartDemoAppLaunch() override;
88 void StartArcKiosk(const AccountId& account_id) override;
87 89
88 // Creates WizardController instance. 90 // Creates WizardController instance.
89 WizardController* CreateWizardController(); 91 WizardController* CreateWizardController();
90 92
91 // Called when the first browser window is created, but before it's shown. 93 // Called when the first browser window is created, but before it's shown.
92 void OnBrowserCreated(); 94 void OnBrowserCreated();
93 95
94 const gfx::Rect& wallpaper_bounds() const { return wallpaper_bounds_; } 96 const gfx::Rect& wallpaper_bounds() const { return wallpaper_bounds_; }
95 97
96 // Trace id for ShowLoginWebUI event (since there exists at most one login 98 // Trace id for ShowLoginWebUI event (since there exists at most one login
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
210 std::unique_ptr<WizardController> wizard_controller_; 212 std::unique_ptr<WizardController> wizard_controller_;
211 213
212 std::unique_ptr<SignInScreenController> signin_screen_controller_; 214 std::unique_ptr<SignInScreenController> signin_screen_controller_;
213 215
214 // App launch controller. 216 // App launch controller.
215 std::unique_ptr<AppLaunchController> app_launch_controller_; 217 std::unique_ptr<AppLaunchController> app_launch_controller_;
216 218
217 // Demo app launcher. 219 // Demo app launcher.
218 std::unique_ptr<DemoAppLauncher> demo_app_launcher_; 220 std::unique_ptr<DemoAppLauncher> demo_app_launcher_;
219 221
222 // ARC kiosk controller.
223 std::unique_ptr<ArcKioskController> arc_kiosk_controller_;
224
220 // Make sure chrome won't exit while we are at login/oobe screen. 225 // Make sure chrome won't exit while we are at login/oobe screen.
221 std::unique_ptr<ScopedKeepAlive> keep_alive_; 226 std::unique_ptr<ScopedKeepAlive> keep_alive_;
222 227
223 // Has ShutdownDisplayHost() already been called? Used to avoid posting our 228 // Has ShutdownDisplayHost() already been called? Used to avoid posting our
224 // own deletion to the message loop twice if the user logs out while we're 229 // own deletion to the message loop twice if the user logs out while we're
225 // still in the process of cleaning up after login (http://crbug.com/134463). 230 // still in the process of cleaning up after login (http://crbug.com/134463).
226 bool shutting_down_; 231 bool shutting_down_;
227 232
228 // Whether progress bar is shown on the OOBE page. 233 // Whether progress bar is shown on the OOBE page.
229 bool oobe_progress_bar_visible_; 234 bool oobe_progress_bar_visible_;
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
313 318
314 base::WeakPtrFactory<LoginDisplayHostImpl> pointer_factory_; 319 base::WeakPtrFactory<LoginDisplayHostImpl> pointer_factory_;
315 base::WeakPtrFactory<LoginDisplayHostImpl> animation_weak_ptr_factory_; 320 base::WeakPtrFactory<LoginDisplayHostImpl> animation_weak_ptr_factory_;
316 321
317 DISALLOW_COPY_AND_ASSIGN(LoginDisplayHostImpl); 322 DISALLOW_COPY_AND_ASSIGN(LoginDisplayHostImpl);
318 }; 323 };
319 324
320 } // namespace chromeos 325 } // namespace chromeos
321 326
322 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_UI_LOGIN_DISPLAY_HOST_IMPL_H_ 327 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_UI_LOGIN_DISPLAY_HOST_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698