Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2619)

Unified Diff: chrome/browser/ui/sync/one_click_signin_helper.cc

Issue 16337017: Remove blank URL when starting sync (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: always remove continue URL from history Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698