| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef GOOGLE_APIS_GAIA_MERGE_SESSION_HELPER_H_ | 5 #ifndef GOOGLE_APIS_GAIA_MERGE_SESSION_HELPER_H_ |
| 6 #define GOOGLE_APIS_GAIA_MERGE_SESSION_HELPER_H_ | 6 #define GOOGLE_APIS_GAIA_MERGE_SESSION_HELPER_H_ |
| 7 | 7 |
| 8 #include <deque> | 8 #include <deque> |
| 9 | 9 |
| 10 #include "base/observer_list.h" | 10 #include "base/observer_list.h" |
| 11 #include "google_apis/gaia/gaia_auth_consumer.h" | 11 #include "google_apis/gaia/gaia_auth_consumer.h" |
| 12 #include "google_apis/gaia/ubertoken_fetcher.h" | 12 #include "google_apis/gaia/ubertoken_fetcher.h" |
| 13 #include "net/url_request/url_fetcher_delegate.h" |
| 13 | 14 |
| 14 class GaiaAuthFetcher; | 15 class GaiaAuthFetcher; |
| 15 class GoogleServiceAuthError; | 16 class GoogleServiceAuthError; |
| 16 class OAuth2TokenService; | 17 class OAuth2TokenService; |
| 17 | 18 |
| 18 namespace net { | 19 namespace net { |
| 19 class URLRequestContextGetter; | 20 class URLRequestContextGetter; |
| 20 } | 21 } |
| 21 | 22 |
| 22 // Merges a Google account known to Chrome into the cookie jar. When merging | 23 // Merges a Google account known to Chrome into the cookie jar. When merging |
| (...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 105 std::deque<std::string> accounts_; | 106 std::deque<std::string> accounts_; |
| 106 | 107 |
| 107 // List of observers to notify when merge session completes. | 108 // List of observers to notify when merge session completes. |
| 108 // Makes sure list is empty on destruction. | 109 // Makes sure list is empty on destruction. |
| 109 ObserverList<Observer, true> observer_list_; | 110 ObserverList<Observer, true> observer_list_; |
| 110 | 111 |
| 111 DISALLOW_COPY_AND_ASSIGN(MergeSessionHelper); | 112 DISALLOW_COPY_AND_ASSIGN(MergeSessionHelper); |
| 112 }; | 113 }; |
| 113 | 114 |
| 114 #endif // GOOGLE_APIS_GAIA_MERGE_SESSION_HELPER_H_ | 115 #endif // GOOGLE_APIS_GAIA_MERGE_SESSION_HELPER_H_ |
| OLD | NEW |