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 496 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
507 | 507 |
508 scoped_ptr<base::DictionaryValue> signin_status(new base::DictionaryValue()); | 508 scoped_ptr<base::DictionaryValue> signin_status(new base::DictionaryValue()); |
509 base::ListValue* signin_info = new base::ListValue(); | 509 base::ListValue* signin_info = new base::ListValue(); |
510 signin_status->Set("signin_info", signin_info); | 510 signin_status->Set("signin_info", signin_info); |
511 | 511 |
512 // A summary of signin related info first. | 512 // A summary of signin related info first. |
513 base::ListValue* basic_info = AddSection(signin_info, "Basic Information"); | 513 base::ListValue* basic_info = AddSection(signin_info, "Basic Information"); |
514 AddSectionEntry(basic_info, "Chrome Version", product_version); | 514 AddSectionEntry(basic_info, "Chrome Version", product_version); |
515 AddSectionEntry(basic_info, "Webview Based Signin?", | 515 AddSectionEntry(basic_info, "Webview Based Signin?", |
516 switches::IsEnableWebviewBasedSignin() == true ? "On" : "Off"); | 516 switches::IsEnableWebviewBasedSignin() == true ? "On" : "Off"); |
517 AddSectionEntry(basic_info, "New Avatar Menu?", | |
518 switches::IsNewAvatarMenu() == true ? "On" : "Off"); | |
519 AddSectionEntry(basic_info, "New Profile Management?", | 517 AddSectionEntry(basic_info, "New Profile Management?", |
520 switches::IsNewProfileManagement() == true ? "On" : "Off"); | 518 switches::IsNewProfileManagement() == true ? "On" : "Off"); |
521 AddSectionEntry(basic_info, "Account Consistency?", | 519 AddSectionEntry(basic_info, "Account Consistency?", |
522 switches::IsEnableAccountConsistency() == true ? "On" : "Off"); | 520 switches::IsEnableAccountConsistency() == true ? "On" : "Off"); |
523 AddSectionEntry(basic_info, "Signin Status", | 521 AddSectionEntry(basic_info, "Signin Status", |
524 signin_manager->IsAuthenticated() ? "Signed In" : "Not Signed In"); | 522 signin_manager->IsAuthenticated() ? "Signed In" : "Not Signed In"); |
525 | 523 |
526 // TODO(robliao): Remove ScopedTracker below once https://crbug.com/422460 is | 524 // TODO(robliao): Remove ScopedTracker below once https://crbug.com/422460 is |
527 // fixed. | 525 // fixed. |
528 tracked_objects::ScopedTracker tracking_profile2( | 526 tracked_objects::ScopedTracker tracking_profile2( |
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
631 } | 629 } |
632 | 630 |
633 for(const std::string& account_id : accounts_in_token_service) { | 631 for(const std::string& account_id : accounts_in_token_service) { |
634 base::DictionaryValue* entry = new base::DictionaryValue(); | 632 base::DictionaryValue* entry = new base::DictionaryValue(); |
635 entry->SetString("accountId", account_id); | 633 entry->SetString("accountId", account_id); |
636 account_info->Append(entry); | 634 account_info->Append(entry); |
637 } | 635 } |
638 | 636 |
639 return signin_status.Pass(); | 637 return signin_status.Pass(); |
640 } | 638 } |
OLD | NEW |