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

Unified Diff: chrome/browser/chromeos/login/app_launch_controller.h

Issue 23449023: Add kiosk browser tests for network configuration. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/login/app_launch_controller.h
diff --git a/chrome/browser/chromeos/login/app_launch_controller.h b/chrome/browser/chromeos/login/app_launch_controller.h
index 0f3d60663956f9be15e13bfaa2cb7b983049f7b3..e8e472f285d8946494bfec43dae0b92b491a8b62 100644
--- a/chrome/browser/chromeos/login/app_launch_controller.h
+++ b/chrome/browser/chromeos/login/app_launch_controller.h
@@ -24,6 +24,7 @@ namespace chromeos {
class LoginDisplayHost;
class OobeDisplay;
+class UserManager;
// Controller for the kiosk app launch process, responsible for
// coordinating loading the kiosk profile, launching the app, and
@@ -43,11 +44,15 @@ class AppLaunchController
void StartAppLaunch();
- static void SkipSplashWaitForTesting();
+ // Customize controller for testing purposes.
+ void SkipSplashWaitForTesting();
+ void SetNetworkWaitForTesting(int wait_time_secs);
+ void SetUserManagerForTesting(UserManager* user_manager);
private:
void Cleanup();
void OnNetworkWaitTimedout();
+ UserManager* GetUserManager();
// KioskProfileLoader::Delegate overrides:
virtual void OnProfileLoaded(Profile* profile) OVERRIDE;
@@ -83,7 +88,9 @@ class AppLaunchController
bool showing_network_dialog_;
int64 launch_splash_start_time_;
- static bool skip_splash_wait_;
+ bool skip_splash_wait_for_testing_;
+ int network_wait_time_;
+ UserManager* user_manager_for_testing_;
DISALLOW_COPY_AND_ASSIGN(AppLaunchController);
};

Powered by Google App Engine
This is Rietveld 408576698