OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 CHROME_BROWSER_UI_SYNC_ONE_CLICK_SIGNIN_SYNC_STARTER_H_ | 5 #ifndef CHROME_BROWSER_UI_SYNC_ONE_CLICK_SIGNIN_SYNC_STARTER_H_ |
6 #define CHROME_BROWSER_UI_SYNC_ONE_CLICK_SIGNIN_SYNC_STARTER_H_ | 6 #define CHROME_BROWSER_UI_SYNC_ONE_CLICK_SIGNIN_SYNC_STARTER_H_ |
7 | 7 |
8 #include <string> | 8 #include <string> |
9 | 9 |
10 #include "base/callback_forward.h" | 10 #include "base/callback_forward.h" |
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
105 | 105 |
106 virtual ~OneClickSigninSyncStarter(); | 106 virtual ~OneClickSigninSyncStarter(); |
107 | 107 |
108 // Initializes the internals of the OneClickSigninSyncStarter object. Can also | 108 // Initializes the internals of the OneClickSigninSyncStarter object. Can also |
109 // be used to re-initialize the object to refer to a newly created profile. | 109 // be used to re-initialize the object to refer to a newly created profile. |
110 void Initialize(Profile* profile, Browser* browser); | 110 void Initialize(Profile* profile, Browser* browser); |
111 | 111 |
112 // SigninTracker::Observer override. | 112 // SigninTracker::Observer override. |
113 virtual void SigninFailed(const GoogleServiceAuthError& error) OVERRIDE; | 113 virtual void SigninFailed(const GoogleServiceAuthError& error) OVERRIDE; |
114 virtual void SigninSuccess() OVERRIDE; | 114 virtual void SigninSuccess() OVERRIDE; |
| 115 virtual void MergeSessionComplete( |
| 116 const GoogleServiceAuthError& error) OVERRIDE; |
115 | 117 |
116 #if defined(ENABLE_CONFIGURATION_POLICY) | 118 #if defined(ENABLE_CONFIGURATION_POLICY) |
117 // User input handler for the signin confirmation dialog. | 119 // User input handler for the signin confirmation dialog. |
118 class SigninDialogDelegate | 120 class SigninDialogDelegate |
119 : public ui::ProfileSigninConfirmationDelegate { | 121 : public ui::ProfileSigninConfirmationDelegate { |
120 public: | 122 public: |
121 SigninDialogDelegate( | 123 SigninDialogDelegate( |
122 base::WeakPtr<OneClickSigninSyncStarter> sync_starter); | 124 base::WeakPtr<OneClickSigninSyncStarter> sync_starter); |
123 virtual ~SigninDialogDelegate(); | 125 virtual ~SigninDialogDelegate(); |
124 virtual void OnCancelSignin() OVERRIDE; | 126 virtual void OnCancelSignin() OVERRIDE; |
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
217 std::string client_id_; | 219 std::string client_id_; |
218 #endif | 220 #endif |
219 | 221 |
220 base::WeakPtrFactory<OneClickSigninSyncStarter> weak_pointer_factory_; | 222 base::WeakPtrFactory<OneClickSigninSyncStarter> weak_pointer_factory_; |
221 | 223 |
222 DISALLOW_COPY_AND_ASSIGN(OneClickSigninSyncStarter); | 224 DISALLOW_COPY_AND_ASSIGN(OneClickSigninSyncStarter); |
223 }; | 225 }; |
224 | 226 |
225 | 227 |
226 #endif // CHROME_BROWSER_UI_SYNC_ONE_CLICK_SIGNIN_SYNC_STARTER_H_ | 228 #endif // CHROME_BROWSER_UI_SYNC_ONE_CLICK_SIGNIN_SYNC_STARTER_H_ |
OLD | NEW |