diff options
| author | davidroche@chromium.org <davidroche@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-26 04:11:34 +0000 |
|---|---|---|
| committer | davidroche@chromium.org <davidroche@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-26 04:11:34 +0000 |
| commit | 5d82f982460d43ec460e06762bf87ae0fb5ffff3 (patch) | |
| tree | 9cb390af03cb9b18fda88ad6946bb2f09d295f09 /remoting/host | |
| parent | 0309ba5e0dd0cd544c53de98e17b0261d280bafc (diff) | |
| download | chromium_src-5d82f982460d43ec460e06762bf87ae0fb5ffff3.zip chromium_src-5d82f982460d43ec460e06762bf87ae0fb5ffff3.tar.gz chromium_src-5d82f982460d43ec460e06762bf87ae0fb5ffff3.tar.bz2 | |
Better document GaiaOAuthClient via comments and updated method name.
BUG=
Review URL: https://chromiumcodereview.appspot.com/17696002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@208615 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/host')
| -rw-r--r-- | remoting/host/setup/host_starter.cc | 6 | ||||
| -rw-r--r-- | remoting/host/setup/host_starter.h | 2 | ||||
| -rw-r--r-- | remoting/host/signaling_connector.cc | 4 | ||||
| -rw-r--r-- | remoting/host/signaling_connector.h | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/remoting/host/setup/host_starter.cc b/remoting/host/setup/host_starter.cc index 1d69ef0..d16137b 100644 --- a/remoting/host/setup/host_starter.cc +++ b/remoting/host/setup/host_starter.cc @@ -85,7 +85,7 @@ void HostStarter::OnGetTokensResponse( refresh_token_ = refresh_token; access_token_ = access_token; // Get the email corresponding to the access token. - oauth_client_->GetUserInfo(access_token_, 1, this); + oauth_client_->GetUserEmail(access_token_, 1, this); } void HostStarter::OnRefreshTokenResponse( @@ -95,10 +95,10 @@ void HostStarter::OnRefreshTokenResponse( NOTREACHED(); } -void HostStarter::OnGetUserInfoResponse(const std::string& user_email) { +void HostStarter::OnGetUserEmailResponse(const std::string& user_email) { if (!main_task_runner_->BelongsToCurrentThread()) { main_task_runner_->PostTask(FROM_HERE, base::Bind( - &HostStarter::OnGetUserInfoResponse, weak_ptr_, user_email)); + &HostStarter::OnGetUserEmailResponse, weak_ptr_, user_email)); return; } user_email_ = user_email; diff --git a/remoting/host/setup/host_starter.h b/remoting/host/setup/host_starter.h index a8b90f2..1d3b97f 100644 --- a/remoting/host/setup/host_starter.h +++ b/remoting/host/setup/host_starter.h @@ -52,7 +52,7 @@ class HostStarter : public gaia::GaiaOAuthClient::Delegate, int expires_in_seconds) OVERRIDE; virtual void OnRefreshTokenResponse(const std::string& access_token, int expires_in_seconds) OVERRIDE; - virtual void OnGetUserInfoResponse(const std::string& user_email) OVERRIDE; + virtual void OnGetUserEmailResponse(const std::string& user_email) OVERRIDE; // remoting::ServiceClient::Delegate virtual void OnHostRegistered() OVERRIDE; diff --git a/remoting/host/signaling_connector.cc b/remoting/host/signaling_connector.cc index 36af665..67c142f 100644 --- a/remoting/host/signaling_connector.cc +++ b/remoting/host/signaling_connector.cc @@ -125,10 +125,10 @@ void SignalingConnector::OnRefreshTokenResponse( base::TimeDelta::FromSeconds(expires_seconds) - base::TimeDelta::FromSeconds(kTokenUpdateTimeBeforeExpirySeconds); - gaia_oauth_client_->GetUserInfo(access_token, 1, this); + gaia_oauth_client_->GetUserEmail(access_token, 1, this); } -void SignalingConnector::OnGetUserInfoResponse(const std::string& user_email) { +void SignalingConnector::OnGetUserEmailResponse(const std::string& user_email) { DCHECK(CalledOnValidThread()); DCHECK(oauth_credentials_.get()); LOG(INFO) << "Received user info."; diff --git a/remoting/host/signaling_connector.h b/remoting/host/signaling_connector.h index ee175c6..c90823b 100644 --- a/remoting/host/signaling_connector.h +++ b/remoting/host/signaling_connector.h @@ -80,7 +80,7 @@ class SignalingConnector int expires_seconds) OVERRIDE; virtual void OnRefreshTokenResponse(const std::string& access_token, int expires_in_seconds) OVERRIDE; - virtual void OnGetUserInfoResponse(const std::string& user_email) OVERRIDE; + virtual void OnGetUserEmailResponse(const std::string& user_email) OVERRIDE; virtual void OnOAuthError() OVERRIDE; virtual void OnNetworkError(int response_code) OVERRIDE; |