| Index: chrome/browser/ui/sync/one_click_signin_sync_starter.h
|
| diff --git a/chrome/browser/ui/sync/one_click_signin_sync_starter.h b/chrome/browser/ui/sync/one_click_signin_sync_starter.h
|
| index e70c7547a1487897894b1b0dd782497018f30b3a..1f470a1330d00d008a227d58756824ce827222f5 100644
|
| --- a/chrome/browser/ui/sync/one_click_signin_sync_starter.h
|
| +++ b/chrome/browser/ui/sync/one_click_signin_sync_starter.h
|
| @@ -112,6 +112,8 @@ class OneClickSigninSyncStarter : public SigninTracker::Observer,
|
| // SigninTracker::Observer override.
|
| virtual void SigninFailed(const GoogleServiceAuthError& error) OVERRIDE;
|
| virtual void SigninSuccess() OVERRIDE;
|
| + virtual void MergeSessionComplete(
|
| + const GoogleServiceAuthError& error) OVERRIDE;
|
|
|
| #if defined(ENABLE_CONFIGURATION_POLICY)
|
| // User input handler for the signin confirmation dialog.
|
|
|