diff options
author | brettw <brettw@chromium.org> | 2015-06-03 09:31:43 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-06-03 16:32:08 +0000 |
commit | 236d317f450601fbb56756b0b5ca802659a045f6 (patch) | |
tree | 086f7f2ed78889e4dc2c17f209871ba364bc9c01 /google_apis | |
parent | e7938cf52a9aeb936c1cb005faaafb9f2b16cd4f (diff) | |
download | chromium_src-236d317f450601fbb56756b0b5ca802659a045f6.zip chromium_src-236d317f450601fbb56756b0b5ca802659a045f6.tar.gz chromium_src-236d317f450601fbb56756b0b5ca802659a045f6.tar.bz2 |
Replace more ObserverList with base::ObserverList.
This is everything but the chrome directory
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
TBR=zelidrag@chromium.org (chromeos)
TBR=keybuk@chromium.org (device/bluetooth)
Review URL: https://codereview.chromium.org/1162943002
Cr-Commit-Position: refs/heads/master@{#332626}
Diffstat (limited to 'google_apis')
-rw-r--r-- | google_apis/drive/auth_service.h | 2 | ||||
-rw-r--r-- | google_apis/gaia/account_tracker.h | 2 | ||||
-rw-r--r-- | google_apis/gaia/identity_provider.h | 5 | ||||
-rw-r--r-- | google_apis/gaia/oauth2_token_service.h | 4 |
4 files changed, 7 insertions, 6 deletions
diff --git a/google_apis/drive/auth_service.h b/google_apis/drive/auth_service.h index 50f3b9f..9ce6abc 100644 --- a/google_apis/drive/auth_service.h +++ b/google_apis/drive/auth_service.h @@ -69,7 +69,7 @@ class AuthService : public AuthServiceInterface, bool has_refresh_token_; std::string access_token_; std::vector<std::string> scopes_; - ObserverList<AuthServiceObserver> observers_; + base::ObserverList<AuthServiceObserver> observers_; base::ThreadChecker thread_checker_; // Note: This should remain the last member so it'll be destroyed and diff --git a/google_apis/gaia/account_tracker.h b/google_apis/gaia/account_tracker.h index 41ebd2e..61d3748 100644 --- a/google_apis/gaia/account_tracker.h +++ b/google_apis/gaia/account_tracker.h @@ -109,7 +109,7 @@ class AccountTracker : public OAuth2TokenService::Observer, scoped_refptr<net::URLRequestContextGetter> request_context_getter_; std::map<std::string, AccountIdFetcher*> user_info_requests_; std::map<std::string, AccountState> accounts_; - ObserverList<Observer> observer_list_; + base::ObserverList<Observer> observer_list_; bool shutdown_called_; }; diff --git a/google_apis/gaia/identity_provider.h b/google_apis/gaia/identity_provider.h index 6ee9b8c..7c7e0d1 100644 --- a/google_apis/gaia/identity_provider.h +++ b/google_apis/gaia/identity_provider.h @@ -83,8 +83,9 @@ class IdentityProvider : public OAuth2TokenService::Observer { void FireOnActiveAccountLogout(); private: - ObserverList<Observer, true> observers_; - ObserverList<OAuth2TokenService::Observer, true> token_service_observers_; + base::ObserverList<Observer, true> observers_; + base::ObserverList<OAuth2TokenService::Observer, true> + token_service_observers_; int token_service_observer_count_; DISALLOW_COPY_AND_ASSIGN(IdentityProvider); diff --git a/google_apis/gaia/oauth2_token_service.h b/google_apis/gaia/oauth2_token_service.h index 2306c10..4decbf4 100644 --- a/google_apis/gaia/oauth2_token_service.h +++ b/google_apis/gaia/oauth2_token_service.h @@ -385,10 +385,10 @@ class OAuth2TokenService : public base::NonThreadSafe { // List of observers to notify when refresh token availability changes. // Makes sure list is empty on destruction. - ObserverList<Observer, true> observer_list_; + base::ObserverList<Observer, true> observer_list_; // List of observers to notify when access token status changes. - ObserverList<DiagnosticsObserver, true> diagnostics_observer_list_; + base::ObserverList<DiagnosticsObserver, true> diagnostics_observer_list_; // The depth of batch changes. int batch_change_depth_; |