| 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 "components/signin/core/browser/about_signin_internals.h" | 5 #include "components/signin/core/browser/about_signin_internals.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <tuple> | 9 #include <tuple> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 519 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 530 "422460 AboutSigninInternals::SigninStatus::ToValue1")); | 530 "422460 AboutSigninInternals::SigninStatus::ToValue1")); |
| 531 | 531 |
| 532 std::unique_ptr<base::DictionaryValue> signin_status( | 532 std::unique_ptr<base::DictionaryValue> signin_status( |
| 533 new base::DictionaryValue()); | 533 new base::DictionaryValue()); |
| 534 base::ListValue* signin_info = new base::ListValue(); | 534 base::ListValue* signin_info = new base::ListValue(); |
| 535 signin_status->Set("signin_info", signin_info); | 535 signin_status->Set("signin_info", signin_info); |
| 536 | 536 |
| 537 // A summary of signin related info first. | 537 // A summary of signin related info first. |
| 538 base::ListValue* basic_info = AddSection(signin_info, "Basic Information"); | 538 base::ListValue* basic_info = AddSection(signin_info, "Basic Information"); |
| 539 AddSectionEntry(basic_info, "Chrome Version", product_version); | 539 AddSectionEntry(basic_info, "Chrome Version", product_version); |
| 540 AddSectionEntry(basic_info, "New Profile Management?", | |
| 541 switches::IsNewProfileManagement() == true ? "On" : "Off"); | |
| 542 AddSectionEntry(basic_info, "Account Consistency?", | 540 AddSectionEntry(basic_info, "Account Consistency?", |
| 543 switches::IsEnableAccountConsistency() == true ? "On" : "Off"); | 541 switches::IsEnableAccountConsistency() == true ? "On" : "Off"); |
| 544 AddSectionEntry(basic_info, "Signin Status", | 542 AddSectionEntry(basic_info, "Signin Status", |
| 545 signin_manager->IsAuthenticated() ? "Signed In" : "Not Signed In"); | 543 signin_manager->IsAuthenticated() ? "Signed In" : "Not Signed In"); |
| 546 OAuth2TokenServiceDelegate::LoadCredentialsState load_tokens_state = | 544 OAuth2TokenServiceDelegate::LoadCredentialsState load_tokens_state = |
| 547 token_service->GetDelegate()->GetLoadCredentialsState(); | 545 token_service->GetDelegate()->GetLoadCredentialsState(); |
| 548 AddSectionEntry(basic_info, "TokenService Status", | 546 AddSectionEntry(basic_info, "TokenService Status", |
| 549 TokenServiceLoadCredentialsStateToLabel(load_tokens_state)); | 547 TokenServiceLoadCredentialsStateToLabel(load_tokens_state)); |
| 550 | 548 |
| 551 // TODO(robliao): Remove ScopedTracker below once https://crbug.com/422460 is | 549 // TODO(robliao): Remove ScopedTracker below once https://crbug.com/422460 is |
| (...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 690 } | 688 } |
| 691 | 689 |
| 692 for(const std::string& account_id : accounts_in_token_service) { | 690 for(const std::string& account_id : accounts_in_token_service) { |
| 693 std::unique_ptr<base::DictionaryValue> entry(new base::DictionaryValue()); | 691 std::unique_ptr<base::DictionaryValue> entry(new base::DictionaryValue()); |
| 694 entry->SetString("accountId", account_id); | 692 entry->SetString("accountId", account_id); |
| 695 account_info->Append(std::move(entry)); | 693 account_info->Append(std::move(entry)); |
| 696 } | 694 } |
| 697 | 695 |
| 698 return signin_status; | 696 return signin_status; |
| 699 } | 697 } |
| OLD | NEW |