| Index: chrome/browser/ui/sync/one_click_signin_helper.h
|
| diff --git a/chrome/browser/ui/sync/one_click_signin_helper.h b/chrome/browser/ui/sync/one_click_signin_helper.h
|
| index 6aa15d4111613e1115b7567e08035801d0a4d22b..168a2cc90c22e5602947df3dde2c2f9dd91ee8c1 100644
|
| --- a/chrome/browser/ui/sync/one_click_signin_helper.h
|
| +++ b/chrome/browser/ui/sync/one_click_signin_helper.h
|
| @@ -100,7 +100,6 @@ class OneClickSigninHelper
|
| const std::string& email,
|
| const std::string& password,
|
| const std::string& refresh_token,
|
| - const std::string& signin_scoped_device_id,
|
| content::WebContents* web_contents,
|
| bool untrusted_confirmation_required,
|
| signin::Source source,
|
| @@ -114,7 +113,6 @@ class OneClickSigninHelper
|
| std::string email;
|
| std::string password;
|
| std::string refresh_token;
|
| - std::string signin_scoped_device_id;
|
|
|
| // Web contents in which the sync setup page should be displayed,
|
| // if necessary. Can be NULL.
|
| @@ -214,7 +212,7 @@ class OneClickSigninHelper
|
| // Handles cross account sign in error. If the supplied |email| does not match
|
| // the last signed in email of the current profile, then Chrome will show a
|
| // confirmation dialog before starting sync. It returns true if there is a
|
| - // cross ccount error, and false otherwise.
|
| + // cross account error, and false otherwise.
|
| static bool HandleCrossAccountError(
|
| content::WebContents* contents,
|
| const std::string& session_index,
|
|
|