| 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 COMPONENTS_SIGNIN_IOS_BROWSER_MERGE_SESSION_OBSERVER_BRIDGE_H_ | 5 #ifndef COMPONENTS_SIGNIN_IOS_BROWSER_MERGE_SESSION_OBSERVER_BRIDGE_H_ |
| 6 #define COMPONENTS_SIGNIN_IOS_BROWSER_MERGE_SESSION_OBSERVER_BRIDGE_H_ | 6 #define COMPONENTS_SIGNIN_IOS_BROWSER_MERGE_SESSION_OBSERVER_BRIDGE_H_ |
| 7 | 7 |
| 8 #import <Foundation/Foundation.h> | 8 #import <Foundation/Foundation.h> |
| 9 | 9 |
| 10 #include <string> | 10 #include <string> |
| 11 | 11 |
| 12 #include "base/macros.h" | 12 #include "base/macros.h" |
| 13 #include "components/signin/core/browser/gaia_cookie_manager_service.h" | 13 #include "components/signin/core/browser/gaia_cookie_manager_service.h" |
| 14 | 14 |
| 15 class AccountReconcilor; | |
| 16 class GoogleServiceAuthError; | 15 class GoogleServiceAuthError; |
| 17 | 16 |
| 18 @protocol MergeSessionObserverBridgeDelegate | 17 @protocol MergeSessionObserverBridgeDelegate |
| 19 | 18 |
| 20 // Informs the delegate that the merge session operation for |account_id| has | 19 // Informs the delegate that the merge session operation for |account_id| has |
| 21 // finished. If there was an error, it will be described in |error|. | 20 // finished. If there was an error, it will be described in |error|. |
| 22 - (void)onMergeSessionCompleted:(const std::string&)account_id | 21 - (void)onMergeSessionCompleted:(const std::string&)account_id |
| 23 error:(const GoogleServiceAuthError&)error; | 22 error:(const GoogleServiceAuthError&)error; |
| 24 | 23 |
| 25 @end | 24 @end |
| (...skipping 10 matching lines...) Expand all Loading... |
| 36 const GoogleServiceAuthError& error) override; | 35 const GoogleServiceAuthError& error) override; |
| 37 | 36 |
| 38 private: | 37 private: |
| 39 id<MergeSessionObserverBridgeDelegate> delegate_; | 38 id<MergeSessionObserverBridgeDelegate> delegate_; |
| 40 GaiaCookieManagerService* cookie_manager_service_; | 39 GaiaCookieManagerService* cookie_manager_service_; |
| 41 | 40 |
| 42 DISALLOW_COPY_AND_ASSIGN(MergeSessionObserverBridge); | 41 DISALLOW_COPY_AND_ASSIGN(MergeSessionObserverBridge); |
| 43 }; | 42 }; |
| 44 | 43 |
| 45 #endif // COMPONENTS_SIGNIN_IOS_BROWSER_MERGE_SESSION_OBSERVER_BRIDGE_H_ | 44 #endif // COMPONENTS_SIGNIN_IOS_BROWSER_MERGE_SESSION_OBSERVER_BRIDGE_H_ |
| OLD | NEW |