Chromium Code Reviews| 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 b035a6c45edbd6ebec9911316690225641e14815..a8b3885b6048b714628d88139bdf627a68748f0d 100644 |
| --- a/chrome/browser/ui/sync/one_click_signin_helper.h |
| +++ b/chrome/browser/ui/sync/one_click_signin_helper.h |
| @@ -35,11 +35,26 @@ class OneClickSigninHelper |
| public content::WebContentsUserData<OneClickSigninHelper>, |
| public SigninTracker::Observer { |
| public: |
| + // Represents user's decision about sign in process. |
| enum AutoAccept { |
| - AUTO_ACCEPT, |
| - NO_AUTO_ACCEPT, |
| + // User decision not yet known. Assume cancel. |
| + AUTO_ACCEPT_NONE, |
| + |
| + // User has explicitly accepted to sign in. A bubble is shown with the |
| + // option to start sync, configure it first, or abort. |
| + AUTO_ACCEPT_ACCEPTED, |
| + |
| + // User has explicitly accepted to sign in, but wants to configure sync |
| + // settings before turing it on. |
| AUTO_ACCEPT_CONFIGURE, |
| - REJECTED_FOR_PROFILE, |
| + |
| + // User has explicitly rejected to sign in. Furthermore, the user does |
| + // not want to be prompted to see the interstitial again in this profile. |
| + AUTO_ACCEPT_REJECTED_FOR_PROFILE, |
| + |
| + // This is an explicit sign in from either first run, NTP, wrench menu, |
| + // or settings page. The user will be signed in automatically with sync |
| + // enabled using default settings. |
| AUTO_ACCEPT_EXPLICIT |
| }; |
| @@ -53,7 +68,7 @@ class OneClickSigninHelper |
| // Argument to CanOffer(). |
| enum CanOfferFor { |
| CAN_OFFER_FOR_ALL, |
| - CAN_OFFER_FOR_INTERSTITAL_ONLY, |
|
tim (not reviewing)
2012/12/14 19:48:29
Did you intend to get rid of this comma?
Roger Tawa OOO till Jul 10th
2012/12/16 03:03:46
yes.
|
| + CAN_OFFER_FOR_INTERSTITAL_ONLY |
| }; |
| virtual ~OneClickSigninHelper(); |
| @@ -141,6 +156,7 @@ class OneClickSigninHelper |
| const std::string& email, |
| AutoAccept auto_accept, |
| SyncPromoUI::Source source, |
| + const GURL& continue_url, |
| int child_id, |
| int route_id); |
| @@ -167,6 +183,7 @@ class OneClickSigninHelper |
| std::string password_; |
| AutoAccept auto_accept_; |
| SyncPromoUI::Source source_; |
| + GURL continue_url_; |
| std::string error_message_; |
| scoped_ptr<SigninTracker> signin_tracker_; |