summaryrefslogtreecommitdiff
path: root/chromium/google_apis/gaia/gaia_switches.cc
diff options
context:
space:
mode:
authorAndras Becsi <andras.becsi@digia.com>2013-12-11 21:33:03 +0100
committerAndras Becsi <andras.becsi@digia.com>2013-12-13 12:34:07 +0100
commitf2a33ff9cbc6d19943f1c7fbddd1f23d23975577 (patch)
tree0586a32aa390ade8557dfd6b4897f43a07449578 /chromium/google_apis/gaia/gaia_switches.cc
parent5362912cdb5eea702b68ebe23702468d17c3017a (diff)
downloadqtwebengine-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.cc')
-rw-r--r--chromium/google_apis/gaia/gaia_switches.cc7
1 files changed, 3 insertions, 4 deletions
diff --git a/chromium/google_apis/gaia/gaia_switches.cc b/chromium/google_apis/gaia/gaia_switches.cc
index c2430b0b737..16228c3837b 100644
--- a/chromium/google_apis/gaia/gaia_switches.cc
+++ b/chromium/google_apis/gaia/gaia_switches.cc
@@ -8,11 +8,10 @@ namespace switches {
const char kClientLoginToOAuth2Url[] = "client-login-to-oauth2-url";
const char kGaiaUrl[] = "gaia-url";
-const char kGoogleApisHost[] = "google-apis-host";
+const char kGoogleApisUrl[] = "google-apis-url";
const char kLsoUrl[] = "lso-url";
const char kOAuth1LoginScope[] = "oauth1-login-scope";
-const char kOAuth2IssueTokenUrl[] = "oauth2-issue-token-url";
-const char kOAuth2TokenUrl[] = "oauth2-token-url";
-const char kOAuthUserInfoUrl[] = "oauth-user-info-url";
+const char kOAuthWrapBridgeUserInfoScope[] =
+ "oauth-wrap-bridge-user-info-scope";
} // namespace switches