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

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

Issue 13542003: Add browser test for new user CrOS login flow (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 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/ui/webui/chromeos/login/signin_screen_handler.h
diff --git a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h
index 8a02b6179a80348281d1b73ca85f41c1a14a9b87..dd859dbbcd08a04bdb4b400d1576f12aa1a09c6d 100644
--- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h
+++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h
@@ -185,6 +185,10 @@ class SigninScreenHandler
ConnectionType connection_type,
const std::string& reason) OVERRIDE;
+ // Use http:// for gaia url because our test http server does not
+ // supporl ssl.
+ static void UseHttpForGaiaForTesting() { http_for_gaia_ = true; }
+
private:
enum UIState {
UI_STATE_UNKNOWN = 0,
@@ -249,7 +253,6 @@ class SigninScreenHandler
virtual void ShowErrorScreen(LoginDisplay::SigninError error_id) OVERRIDE;
virtual void ShowSigninScreenForCreds(const std::string& username,
const std::string& password) OVERRIDE;
-
// BrowsingDataRemover::Observer overrides.
virtual void OnBrowsingDataRemoverDone() OVERRIDE;
@@ -435,6 +438,10 @@ class SigninScreenHandler
// NOTIFICATION_AUTH_CANCELLED.
bool has_pending_auth_ui_;
+ // Testing flag, true when we want to use http:// for gaia
+ // url. Because our test http server does not supporl ssl.
+ static bool http_for_gaia_;
+
DISALLOW_COPY_AND_ASSIGN(SigninScreenHandler);
};

Powered by Google App Engine
This is Rietveld 408576698