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 "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/hash.h" | 8 #include "base/hash.h" |
9 #include "base/i18n/time_formatting.h" | 9 #include "base/i18n/time_formatting.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
(...skipping 498 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
509 FROM_HERE_WITH_EXPLICIT_FUNCTION( | 509 FROM_HERE_WITH_EXPLICIT_FUNCTION( |
510 "422460 AboutSigninInternals::SigninStatus::ToValue1")); | 510 "422460 AboutSigninInternals::SigninStatus::ToValue1")); |
511 | 511 |
512 scoped_ptr<base::DictionaryValue> signin_status(new base::DictionaryValue()); | 512 scoped_ptr<base::DictionaryValue> signin_status(new base::DictionaryValue()); |
513 base::ListValue* signin_info = new base::ListValue(); | 513 base::ListValue* signin_info = new base::ListValue(); |
514 signin_status->Set("signin_info", signin_info); | 514 signin_status->Set("signin_info", signin_info); |
515 | 515 |
516 // A summary of signin related info first. | 516 // A summary of signin related info first. |
517 base::ListValue* basic_info = AddSection(signin_info, "Basic Information"); | 517 base::ListValue* basic_info = AddSection(signin_info, "Basic Information"); |
518 AddSectionEntry(basic_info, "Chrome Version", product_version); | 518 AddSectionEntry(basic_info, "Chrome Version", product_version); |
519 AddSectionEntry(basic_info, "Webview Based Signin?", | |
520 switches::IsEnableWebviewBasedSignin() == true ? "On" : "Off"); | |
521 AddSectionEntry(basic_info, "New Profile Management?", | 519 AddSectionEntry(basic_info, "New Profile Management?", |
522 switches::IsNewProfileManagement() == true ? "On" : "Off"); | 520 switches::IsNewProfileManagement() == true ? "On" : "Off"); |
523 AddSectionEntry(basic_info, "Account Consistency?", | 521 AddSectionEntry(basic_info, "Account Consistency?", |
524 switches::IsEnableAccountConsistency() == true ? "On" : "Off"); | 522 switches::IsEnableAccountConsistency() == true ? "On" : "Off"); |
525 AddSectionEntry(basic_info, "Signin Status", | 523 AddSectionEntry(basic_info, "Signin Status", |
526 signin_manager->IsAuthenticated() ? "Signed In" : "Not Signed In"); | 524 signin_manager->IsAuthenticated() ? "Signed In" : "Not Signed In"); |
527 | 525 |
528 // TODO(robliao): Remove ScopedTracker below once https://crbug.com/422460 is | 526 // TODO(robliao): Remove ScopedTracker below once https://crbug.com/422460 is |
529 // fixed. | 527 // fixed. |
530 tracked_objects::ScopedTracker tracking_profile2( | 528 tracked_objects::ScopedTracker tracking_profile2( |
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
669 } | 667 } |
670 | 668 |
671 for(const std::string& account_id : accounts_in_token_service) { | 669 for(const std::string& account_id : accounts_in_token_service) { |
672 base::DictionaryValue* entry = new base::DictionaryValue(); | 670 base::DictionaryValue* entry = new base::DictionaryValue(); |
673 entry->SetString("accountId", account_id); | 671 entry->SetString("accountId", account_id); |
674 account_info->Append(entry); | 672 account_info->Append(entry); |
675 } | 673 } |
676 | 674 |
677 return signin_status.Pass(); | 675 return signin_status.Pass(); |
678 } | 676 } |
OLD | NEW |