| Index: chrome/browser/ui/sync/one_click_signin_helper.cc
|
| diff --git a/chrome/browser/ui/sync/one_click_signin_helper.cc b/chrome/browser/ui/sync/one_click_signin_helper.cc
|
| index 580749f0ce7b258e9a64e199996e303737b3007a..da8977e23771bca31d7807aa2afd2199f540831a 100644
|
| --- a/chrome/browser/ui/sync/one_click_signin_helper.cc
|
| +++ b/chrome/browser/ui/sync/one_click_signin_helper.cc
|
| @@ -1059,6 +1059,9 @@ void OneClickSigninHelper::DidStopLoading(
|
| url.ReplaceComponents(replacements) ==
|
| continue_url_.ReplaceComponents(replacements));
|
|
|
| + if (continue_url_match)
|
| + RemoveCurrentHistoryItem(contents);
|
| +
|
| // If there is no valid email yet, there is nothing to do. As of M26, the
|
| // password is allowed to be empty, since its no longer required to setup
|
| // sync.
|
| @@ -1069,7 +1072,6 @@ void OneClickSigninHelper::DidStopLoading(
|
| std::string unused_value;
|
| if (net::GetValueForKeyInQuery(url, "ntp", &unused_value)) {
|
| SyncPromoUI::SetUserSkippedSyncPromo(profile);
|
| - RemoveCurrentHistoryItem(contents);
|
| RedirectToNtpOrAppsPage();
|
| }
|
|
|
| @@ -1229,7 +1231,6 @@ void OneClickSigninHelper::DidStopLoading(
|
| // it will redirect back to webstore.
|
| if (source_ != SyncPromoUI::SOURCE_SETTINGS &&
|
| source_ != SyncPromoUI::SOURCE_WEBSTORE_INSTALL) {
|
| - RemoveCurrentHistoryItem(contents);
|
| RedirectToNtpOrAppsPage();
|
| }
|
| break;
|
|
|