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

Side by Side Diff: chrome/browser/ui/sync/one_click_signin_helper.cc

Issue 12264002: Use "chrome://settings/search#Users" instead of "chrome://settings" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address review comments Created 7 years, 10 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 | chrome/common/url_constants.h » ('j') | 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 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 } 164 }
165 165
166 void StartExplicitSync(const StartSyncArgs& args, 166 void StartExplicitSync(const StartSyncArgs& args,
167 content::WebContents* contents, 167 content::WebContents* contents,
168 OneClickSigninSyncStarter::StartSyncMode start_mode, 168 OneClickSigninSyncStarter::StartSyncMode start_mode,
169 int button) { 169 int button) {
170 if (button == IDS_ONE_CLICK_SIGNIN_CONFIRM_EMAIL_DIALOG_OK_BUTTON) { 170 if (button == IDS_ONE_CLICK_SIGNIN_CONFIRM_EMAIL_DIALOG_OK_BUTTON) {
171 contents->GetController().LoadURL( 171 contents->GetController().LoadURL(
172 GURL(chrome::kChromeUINewTabURL), content::Referrer(), 172 GURL(chrome::kChromeUINewTabURL), content::Referrer(),
173 content::PAGE_TRANSITION_AUTO_TOPLEVEL, std::string()); 173 content::PAGE_TRANSITION_AUTO_TOPLEVEL, std::string());
174 chrome::ShowSettings(args.browser); 174 chrome::ShowSettingsSubPage(args.browser,
175 std::string(chrome::kSearchUsersSubPage));
175 } else { 176 } else {
176 StartSync(args, start_mode); 177 StartSync(args, start_mode);
177 } 178 }
178 } 179 }
179 180
180 void ClearPendingEmailOnIOThread(content::ResourceContext* context) { 181 void ClearPendingEmailOnIOThread(content::ResourceContext* context) {
181 ProfileIOData* io_data = ProfileIOData::FromResourceContext(context); 182 ProfileIOData* io_data = ProfileIOData::FromResourceContext(context);
182 DCHECK(io_data); 183 DCHECK(io_data);
183 io_data->set_reverse_autologin_pending_email(std::string()); 184 io_data->set_reverse_autologin_pending_email(std::string());
184 } 185 }
(...skipping 979 matching lines...) Expand 10 before | Expand all | Expand 10 after
1164 break; 1165 break;
1165 } 1166 }
1166 } 1167 }
1167 1168
1168 RedirectToNTP(); 1169 RedirectToNTP();
1169 } 1170 }
1170 1171
1171 void OneClickSigninHelper::SigninSuccess() { 1172 void OneClickSigninHelper::SigninSuccess() {
1172 RedirectToNTP(); 1173 RedirectToNTP();
1173 } 1174 }
OLDNEW
« no previous file with comments | « no previous file | chrome/common/url_constants.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698