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

Unified Diff: chrome/browser/ui/webui/chromeos/login/enterprise_oauth_enrollment_screen_handler.cc

Issue 10443024: Added chrome switch that lets tests override URL path, moved GAIA auth extension from CrOS (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 7 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/enterprise_oauth_enrollment_screen_handler.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/enterprise_oauth_enrollment_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/enterprise_oauth_enrollment_screen_handler.cc
index 99bc8fc30eaee2ec493d82aa5c66a57d54bfc39d..660bdbf03c98596d4968f5246156b6cfdb0bc3c2 100644
--- a/chrome/browser/ui/webui/chromeos/login/enterprise_oauth_enrollment_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/enterprise_oauth_enrollment_screen_handler.cc
@@ -7,6 +7,7 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/callback.h"
+#include "base/command_line.h"
#include "base/message_loop.h"
#include "base/metrics/histogram.h"
#include "chrome/browser/chromeos/login/authenticator.h"
@@ -15,6 +16,7 @@
#include "chrome/browser/policy/auto_enrollment_client.h"
#include "chrome/browser/policy/enterprise_metrics.h"
#include "chrome/browser/profiles/profile.h"
+#include "chrome/common/chrome_switches.h"
#include "chrome/common/net/gaia/gaia_constants.h"
#include "chrome/common/net/gaia/gaia_urls.h"
#include "chrome/common/net/gaia/google_service_auth_error.h"
@@ -512,6 +514,11 @@ void EnterpriseOAuthEnrollmentScreenHandler::DoShow() {
screen_data.SetString("signin_url", kGaiaExtStartPage);
screen_data.SetString("gaiaOrigin",
GaiaUrls::GetInstance()->gaia_origin_url());
+ if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kGaiaUrlPath)) {
+ screen_data.SetString("gaiaUrlPath",
+ CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
+ switches::kGaiaUrlPath));
+ }
screen_data.SetBoolean("is_auto_enrollment", is_auto_enrollment_);
if (!test_email_.empty()) {
screen_data.SetString("test_email", test_email_);

Powered by Google App Engine
This is Rietveld 408576698