diff options
| author | joaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-20 01:22:57 +0000 |
|---|---|---|
| committer | joaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-20 01:22:57 +0000 |
| commit | 4d69b8a5008aded9ac43d2861b63c379fdad461f (patch) | |
| tree | c50aaae414cd7d1d891f0a167701cad2ee95b05d /chrome/browser/ui | |
| parent | 6a498ea5ce42dac982a317d07c6f08c15ab70b73 (diff) | |
| download | chromium_src-4d69b8a5008aded9ac43d2861b63c379fdad461f.zip chromium_src-4d69b8a5008aded9ac43d2861b63c379fdad461f.tar.gz chromium_src-4d69b8a5008aded9ac43d2861b63c379fdad461f.tar.bz2 | |
Moved static Gaia OAuth URLs to GaiaUrls.
The 'gaiaOrigin' parameter is used by a chromium-os extension. The corresponding CL is at http://gerrit.chromium.org/gerrit/#change,7909
BUG=chromium-os:20491
TEST=Everything still works; --gaia-host also applies to oauth urls
Review URL: http://codereview.chromium.org/7931009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101886 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui')
| -rw-r--r-- | chrome/browser/ui/webui/chromeos/login/enterprise_oauth_enrollment_screen_handler.cc | 3 | ||||
| -rw-r--r-- | chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc | 2 |
2 files changed, 5 insertions, 0 deletions
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 2152b47..6ce5847 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 @@ -12,6 +12,7 @@ #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" #include "chrome/common/url_constants.h" #include "content/browser/renderer_host/render_view_host.h" @@ -315,6 +316,8 @@ void EnterpriseOAuthEnrollmentScreenHandler::ResetAuth() { void EnterpriseOAuthEnrollmentScreenHandler::DoShow() { DictionaryValue screen_data; screen_data.SetString("signin_url", kGaiaExtStartPage); + screen_data.SetString("gaiaOrigin", + GaiaUrls::GetInstance()->gaia_origin_url()); ShowScreen("oauth-enrollment", &screen_data); } diff --git a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc index d7b121a..b3cf0ee 100644 --- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc +++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc @@ -18,6 +18,7 @@ #include "chrome/browser/chromeos/user_cros_settings_provider.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_switches.h" +#include "chrome/common/net/gaia/gaia_urls.h" #include "chrome/common/url_constants.h" #include "content/browser/tab_contents/tab_contents.h" #include "content/common/notification_service.h" @@ -272,6 +273,7 @@ void SigninScreenHandler::ShowSigninScreenIfReady() { UserCrosSettingsProvider::cached_allow_new_user()); params.SetBoolean("guestSignin", UserCrosSettingsProvider::cached_allow_guest()); + params.SetString("gaiaOrigin", GaiaUrls::GetInstance()->gaia_origin_url()); // Test automation data: const CommandLine* command_line = CommandLine::ForCurrentProcess(); |