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