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/webui/sync_setup_handler.h" | 5 #include "chrome/browser/ui/webui/sync_setup_handler.h" |
6 | 6 |
7 #include "base/basictypes.h" | 7 #include "base/basictypes.h" |
8 #include "base/bind.h" | 8 #include "base/bind.h" |
9 #include "base/bind_helpers.h" | 9 #include "base/bind_helpers.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 511 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
522 signin::HISTOGRAM_SHOWN, | 522 signin::HISTOGRAM_SHOWN, |
523 signin::HISTOGRAM_MAX); | 523 signin::HISTOGRAM_MAX); |
524 | 524 |
525 SigninErrorController* error_controller = | 525 SigninErrorController* error_controller = |
526 ProfileOAuth2TokenServiceFactory::GetForProfile(browser->profile())-> | 526 ProfileOAuth2TokenServiceFactory::GetForProfile(browser->profile())-> |
527 signin_error_controller(); | 527 signin_error_controller(); |
528 DCHECK(error_controller->HasError()); | 528 DCHECK(error_controller->HasError()); |
529 if (switches::IsNewProfileManagement()) { | 529 if (switches::IsNewProfileManagement()) { |
530 browser->window()->ShowAvatarBubbleFromAvatarButton( | 530 browser->window()->ShowAvatarBubbleFromAvatarButton( |
531 BrowserWindow::AVATAR_BUBBLE_MODE_REAUTH, | 531 BrowserWindow::AVATAR_BUBBLE_MODE_REAUTH, |
532 signin::GAIA_SERVICE_TYPE_NONE); | 532 signin::ManageAccountsParams()); |
533 } else { | 533 } else { |
534 url = signin::GetReauthURL(browser->profile(), | 534 url = signin::GetReauthURL(browser->profile(), |
535 error_controller->error_account_id()); | 535 error_controller->error_account_id()); |
536 } | 536 } |
537 } else { | 537 } else { |
538 if (switches::IsNewProfileManagement()) { | 538 if (switches::IsNewProfileManagement()) { |
539 browser->window()->ShowAvatarBubbleFromAvatarButton( | 539 browser->window()->ShowAvatarBubbleFromAvatarButton( |
540 BrowserWindow::AVATAR_BUBBLE_MODE_SIGNIN, | 540 BrowserWindow::AVATAR_BUBBLE_MODE_SIGNIN, |
541 signin::GAIA_SERVICE_TYPE_NONE); | 541 signin::ManageAccountsParams()); |
542 } else { | 542 } else { |
543 url = signin::GetPromoURL(signin::SOURCE_SETTINGS, true); | 543 url = signin::GetPromoURL(signin::SOURCE_SETTINGS, true); |
544 } | 544 } |
545 } | 545 } |
546 | 546 |
547 if (url.is_valid()) | 547 if (url.is_valid()) |
548 chrome::ShowSingletonTab(browser, url); | 548 chrome::ShowSingletonTab(browser, url); |
549 } | 549 } |
550 #endif | 550 #endif |
551 | 551 |
(...skipping 393 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
945 | 945 |
946 LoginUIService* service = GetLoginUIService(); | 946 LoginUIService* service = GetLoginUIService(); |
947 DCHECK(service); | 947 DCHECK(service); |
948 service->current_login_ui()->FocusUI(); | 948 service->current_login_ui()->FocusUI(); |
949 return true; | 949 return true; |
950 } | 950 } |
951 | 951 |
952 LoginUIService* SyncSetupHandler::GetLoginUIService() const { | 952 LoginUIService* SyncSetupHandler::GetLoginUIService() const { |
953 return LoginUIServiceFactory::GetForProfile(GetProfile()); | 953 return LoginUIServiceFactory::GetForProfile(GetProfile()); |
954 } | 954 } |
OLD | NEW |