summaryrefslogtreecommitdiffstats
path: root/google_apis
diff options
context:
space:
mode:
authorjamescook <jamescook@chromium.org>2014-10-27 09:36:45 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-27 16:37:00 +0000
commita3ea7ac28857f5b088518383d789e948da1325be (patch)
treee9a2f58485f5fc2005f55a72275cf22a60bfef68 /google_apis
parentcca5cc1cadd95782faadcca310c9d211a9c03d4f (diff)
downloadchromium_src-a3ea7ac28857f5b088518383d789e948da1325be.zip
chromium_src-a3ea7ac28857f5b088518383d789e948da1325be.tar.gz
chromium_src-a3ea7ac28857f5b088518383d789e948da1325be.tar.bz2
Fix a typo in an OAuth2TokenService classname
Also fix some linter errors. BUG=none TEST=compiles Review URL: https://codereview.chromium.org/681483003 Cr-Commit-Position: refs/heads/master@{#301378}
Diffstat (limited to 'google_apis')
-rw-r--r--google_apis/gaia/oauth2_token_service.cc6
-rw-r--r--google_apis/gaia/oauth2_token_service.h12
2 files changed, 9 insertions, 9 deletions
diff --git a/google_apis/gaia/oauth2_token_service.cc b/google_apis/gaia/oauth2_token_service.cc
index df46b2c..0945723 100644
--- a/google_apis/gaia/oauth2_token_service.cc
+++ b/google_apis/gaia/oauth2_token_service.cc
@@ -78,13 +78,13 @@ void OAuth2TokenService::RequestImpl::InformConsumer(
consumer_->OnGetTokenFailure(this, error);
}
-OAuth2TokenService::ScopedBacthChange::ScopedBacthChange(
+OAuth2TokenService::ScopedBatchChange::ScopedBatchChange(
OAuth2TokenService* token_service) : token_service_(token_service) {
DCHECK(token_service_);
token_service_->StartBatchChanges();
}
-OAuth2TokenService::ScopedBacthChange::~ScopedBacthChange() {
+OAuth2TokenService::ScopedBatchChange::~ScopedBatchChange() {
token_service_->EndBatchChanges();
}
@@ -150,7 +150,7 @@ class OAuth2TokenService::Fetcher : public OAuth2AccessTokenConsumer {
const GoogleServiceAuthError& error() const { return error_; }
protected:
- // OAuth2AccessTokenConsumer
+ // OAuth2AccessTokenConsumer
void OnGetTokenSuccess(const std::string& access_token,
const base::Time& expiration_date) override;
void OnGetTokenFailure(const GoogleServiceAuthError& error) override;
diff --git a/google_apis/gaia/oauth2_token_service.h b/google_apis/gaia/oauth2_token_service.h
index 202d7d2..727768c 100644
--- a/google_apis/gaia/oauth2_token_service.h
+++ b/google_apis/gaia/oauth2_token_service.h
@@ -69,7 +69,7 @@ class OAuth2TokenService : public base::NonThreadSafe {
// which will be called back when the request completes.
class Consumer {
public:
- Consumer(const std::string& id);
+ explicit Consumer(const std::string& id);
virtual ~Consumer();
std::string id() const { return id_; }
@@ -214,7 +214,7 @@ class OAuth2TokenService : public base::NonThreadSafe {
public Request {
public:
// |consumer| is required to outlive this.
- explicit RequestImpl(const std::string& account_id, Consumer* consumer);
+ RequestImpl(const std::string& account_id, Consumer* consumer);
~RequestImpl() override;
// Overridden from Request:
@@ -234,13 +234,13 @@ class OAuth2TokenService : public base::NonThreadSafe {
};
// Helper class to scope batch changes.
- class ScopedBacthChange {
+ class ScopedBatchChange {
public:
- ScopedBacthChange(OAuth2TokenService* token_service);
- ~ScopedBacthChange();
+ explicit ScopedBatchChange(OAuth2TokenService* token_service);
+ ~ScopedBatchChange();
private:
OAuth2TokenService* token_service_; // Weak.
- DISALLOW_COPY_AND_ASSIGN(ScopedBacthChange);
+ DISALLOW_COPY_AND_ASSIGN(ScopedBatchChange);
};
// Subclasses can override if they want to report errors to the user.