OLD | NEW |
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 303 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
314 base::MessageLoopProxy::current()->PostNonNestableTask( | 314 base::MessageLoopProxy::current()->PostNonNestableTask( |
315 FROM_HERE, | 315 FROM_HERE, |
316 base::Bind(RedirectToNtpOrAppsPageWithIds, | 316 base::Bind(RedirectToNtpOrAppsPageWithIds, |
317 contents->GetRenderProcessHost()->GetID(), | 317 contents->GetRenderProcessHost()->GetID(), |
318 contents->GetRoutingID(), | 318 contents->GetRoutingID(), |
319 args.source)); | 319 args.source)); |
320 } | 320 } |
321 } | 321 } |
322 if (action == ConfirmEmailDialogDelegate::CREATE_NEW_USER) { | 322 if (action == ConfirmEmailDialogDelegate::CREATE_NEW_USER) { |
323 chrome::ShowSettingsSubPage(args.browser, | 323 chrome::ShowSettingsSubPage(args.browser, |
324 std::string(chrome::kSearchUsersSubPage)); | 324 std::string(chrome::kCreateProfileSubPage)); |
325 } | 325 } |
326 } | 326 } |
327 } | 327 } |
328 | 328 |
329 void ClearPendingEmailOnIOThread(content::ResourceContext* context) { | 329 void ClearPendingEmailOnIOThread(content::ResourceContext* context) { |
330 ProfileIOData* io_data = ProfileIOData::FromResourceContext(context); | 330 ProfileIOData* io_data = ProfileIOData::FromResourceContext(context); |
331 DCHECK(io_data); | 331 DCHECK(io_data); |
332 io_data->set_reverse_autologin_pending_email(std::string()); | 332 io_data->set_reverse_autologin_pending_email(std::string()); |
333 } | 333 } |
334 | 334 |
(...skipping 1326 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1661 // If the web contents is showing a blank page and not about to be closed, | 1661 // If the web contents is showing a blank page and not about to be closed, |
1662 // redirect to the NTP or apps page. | 1662 // redirect to the NTP or apps page. |
1663 if (signin::IsContinueUrlForWebBasedSigninFlow(current_url) && | 1663 if (signin::IsContinueUrlForWebBasedSigninFlow(current_url) && |
1664 !signin::IsAutoCloseEnabledInURL(original_continue_url_)) { | 1664 !signin::IsAutoCloseEnabledInURL(original_continue_url_)) { |
1665 RedirectToNtpOrAppsPage( | 1665 RedirectToNtpOrAppsPage( |
1666 web_contents(), | 1666 web_contents(), |
1667 signin::GetSourceForPromoURL(original_continue_url_)); | 1667 signin::GetSourceForPromoURL(original_continue_url_)); |
1668 } | 1668 } |
1669 } | 1669 } |
1670 } | 1670 } |
OLD | NEW |