diff options
author | Andras Becsi <andras.becsi@digia.com> | 2013-12-11 21:33:03 +0100 |
---|---|---|
committer | Andras Becsi <andras.becsi@digia.com> | 2013-12-13 12:34:07 +0100 |
commit | f2a33ff9cbc6d19943f1c7fbddd1f23d23975577 (patch) | |
tree | 0586a32aa390ade8557dfd6b4897f43a07449578 /chromium/google_apis/gaia/gaia_switches.h | |
parent | 5362912cdb5eea702b68ebe23702468d17c3017a (diff) | |
download | qtwebengine-chromium-f2a33ff9cbc6d19943f1c7fbddd1f23d23975577.tar.gz |
Update Chromium to branch 1650 (31.0.1650.63)
Change-Id: I57d8c832eaec1eb2364e0a8e7352a6dd354db99f
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'chromium/google_apis/gaia/gaia_switches.h')
-rw-r--r-- | chromium/google_apis/gaia/gaia_switches.h | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/chromium/google_apis/gaia/gaia_switches.h b/chromium/google_apis/gaia/gaia_switches.h index 727a35557a9..0700f36c70c 100644 --- a/chromium/google_apis/gaia/gaia_switches.h +++ b/chromium/google_apis/gaia/gaia_switches.h @@ -14,29 +14,20 @@ extern const char kClientLoginToOAuth2Url[]; // "https://accounts.google.com". extern const char kGaiaUrl[]; -// Specifies the backend server used for Google API calls. The https:// prefix -// and the trailing slash should be omitted. -// The default value is "www.googleapis.com". -extern const char kGoogleApisHost[]; +// Specifies the backend server used for Google API calls. +// The default value is "https://www.googleapis.com". +extern const char kGoogleApisUrl[]; // Specifies the backend server used for lso authentication calls. // "https://accounts.google.com". extern const char kLsoUrl[]; -// TODO(zelidrag): Get rid of all following since all URLs should be -// controlled only with --gaia-host, --lso-host and --google-apis-host. - // Specifies custom OAuth1 login scope for testing purposes. extern const char kOAuth1LoginScope[]; -// Specifies custom OAuth2 issue token URL for testing purposes. -extern const char kOAuth2IssueTokenUrl[]; - -// Specifies custom OAuth2 token URL for testing purposes. -extern const char kOAuth2TokenUrl[]; +// Overrides OAuth wrap bridge user info scope. +extern const char kOAuthWrapBridgeUserInfoScope[]; -// Specifies custom OAuth user info URL for testing purposes. -extern const char kOAuthUserInfoUrl[]; } // namespace switches #endif // GOOGLE_APIS_GAIA_GAIA_SWITCHES_H_ |