Identity API: web-based scope approval dialogs for getAuthToken

When getAuthToken needs to prompt a user for permissions, it now uses
a web-based authorization flow instead of native dialogs.

BUG=228908
(step #4 of the bug description)

Review URL: https://chromiumcodereview.appspot.com/15148007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@200683 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 8 insertions, 0 deletions

diff --git a/google_apis/gaia/gaia_urls.cc b/google_apis/gaia/gaia_urls.cc
index f5734c7..2135c31 100644
--- a/google_apis/gaia/gaia_urls.cc
+++ b/google_apis/gaia/gaia_urls.cc
@@ -31,6 +31,7 @@ const char kOAuthRevokeTokenUrlSuffix[] = "/AuthSubRevokeToken";
 // API calls from accounts.google.com (LSO)
 const char kGetOAuthTokenUrlSuffix[] = "/o/oauth/GetOAuthToken/";
 const char kClientLoginToOAuth2UrlSuffix[] = "/o/oauth2/programmatic_auth";
+const char kOAuth2AuthUrlSuffix[] = "/o/oauth2/auth";
 const char kOAuth2RevokeUrlSuffix[] = "/o/oauth2/revoke";
 const char kOAuth2TokenUrlSuffix[] = "/o/oauth2/token";
 const char kClientOAuthUrlSuffix[] = "/ClientOAuth";
@@ -116,6 +117,7 @@ GaiaUrls::GaiaUrls() {
   get_oauth_token_url_ = lso_origin_url_ + kGetOAuthTokenUrlSuffix;
   std::string client_login_to_oauth2_url = lso_origin_url_ +
                                            kClientLoginToOAuth2UrlSuffix;
+  oauth2_auth_url_ = lso_origin_url_ + kOAuth2AuthUrlSuffix;
   std::string oauth2_token_url = lso_origin_url_ + kOAuth2TokenUrlSuffix;
   oauth2_revoke_url_ = lso_origin_url_ + kOAuth2RevokeUrlSuffix;
 
@@ -229,6 +231,10 @@ const std::string& GaiaUrls::client_login_to_oauth2_url() {
   return client_login_to_oauth2_url_;
 }
 
+const std::string& GaiaUrls::oauth2_auth_url() {
+  return oauth2_auth_url_;
+}
+
 const std::string& GaiaUrls::oauth2_token_url() {
   return oauth2_token_url_;
 }
diff --git a/google_apis/gaia/gaia_urls.h b/google_apis/gaia/gaia_urls.h
index 3fd19bc..3b434e4b 100644
--- a/google_apis/gaia/gaia_urls.h
+++ b/google_apis/gaia/gaia_urls.h
@@ -38,6 +38,7 @@ class GaiaUrls {
   const std::string& oauth2_chrome_client_id();
   const std::string& oauth2_chrome_client_secret();
   const std::string& client_login_to_oauth2_url();
+  const std::string& oauth2_auth_url();
   const std::string& oauth2_token_url();
   const std::string& oauth2_issue_token_url();
   const std::string& oauth2_revoke_url();
@@ -75,6 +76,7 @@ class GaiaUrls {
   std::string oauth2_chrome_client_id_;
   std::string oauth2_chrome_client_secret_;
   std::string client_login_to_oauth2_url_;
+  std::string oauth2_auth_url_;
   std::string oauth2_token_url_;
   std::string oauth2_issue_token_url_;
   std::string oauth2_revoke_url_;