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

Side by Side 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: 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/sync/one_click_signin_helper.h" 5 #include "chrome/browser/ui/sync/one_click_signin_helper.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <functional> 8 #include <functional>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 1188 matching lines...) Expand 10 before | Expand all | Expand 10 after
1199 email_, 1199 email_,
1200 base::Bind( 1200 base::Bind(
1201 &StartExplicitSync, 1201 &StartExplicitSync,
1202 StartSyncArgs(profile, browser, auto_accept_, 1202 StartSyncArgs(profile, browser, auto_accept_,
1203 session_index_, email_, password_, 1203 session_index_, email_, password_,
1204 force_same_tab_navigation, 1204 force_same_tab_navigation,
1205 false /* confirmation_required */, source_), 1205 false /* confirmation_required */, source_),
1206 contents, 1206 contents,
1207 start_mode)); 1207 start_mode));
1208 } else { 1208 } else {
1209 RemoveCurrentHistoryItem(contents);
Roger Tawa OOO till Jul 10th 2013/06/03 21:15:24 Maybe this should be done at line 1189 above, and
1209 StartSync( 1210 StartSync(
1210 StartSyncArgs(profile, browser, auto_accept_, session_index_, 1211 StartSyncArgs(profile, browser, auto_accept_, session_index_,
1211 email_, password_, force_same_tab_navigation, 1212 email_, password_, force_same_tab_navigation,
1212 untrusted_confirmation_required_, source_), 1213 untrusted_confirmation_required_, source_),
1213 start_mode); 1214 start_mode);
1214 } 1215 }
1215 1216
1216 if (source_ == SyncPromoUI::SOURCE_SETTINGS && 1217 if (source_ == SyncPromoUI::SOURCE_SETTINGS &&
1217 SyncPromoUI::GetSourceForSyncPromoURL(continue_url_) == 1218 SyncPromoUI::GetSourceForSyncPromoURL(continue_url_) ==
1218 SyncPromoUI::SOURCE_WEBSTORE_INSTALL) { 1219 SyncPromoUI::SOURCE_WEBSTORE_INSTALL) {
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
1266 contents->GetController().LoadURL(redirect_url_, 1267 contents->GetController().LoadURL(redirect_url_,
1267 content::Referrer(), 1268 content::Referrer(),
1268 content::PAGE_TRANSITION_AUTO_TOPLEVEL, 1269 content::PAGE_TRANSITION_AUTO_TOPLEVEL,
1269 std::string()); 1270 std::string());
1270 } 1271 }
1271 1272
1272 // Clear the redirect URL. 1273 // Clear the redirect URL.
1273 redirect_url_ = GURL(); 1274 redirect_url_ = GURL();
1274 sync_service->RemoveObserver(this); 1275 sync_service->RemoveObserver(this);
1275 } 1276 }
OLDNEW
« 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