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/debug/trace_event.h" | 8 #include "base/debug/trace_event.h" |
9 #include "base/hash.h" | 9 #include "base/hash.h" |
10 #include "base/i18n/time_formatting.h" | 10 #include "base/i18n/time_formatting.h" |
(...skipping 425 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
436 // A summary of signin related info first. | 436 // A summary of signin related info first. |
437 base::ListValue* basic_info = AddSection(signin_info, "Basic Information"); | 437 base::ListValue* basic_info = AddSection(signin_info, "Basic Information"); |
438 const std::string signin_status_string = | 438 const std::string signin_status_string = |
439 untimed_signin_fields[USERNAME - UNTIMED_FIELDS_BEGIN].empty() | 439 untimed_signin_fields[USERNAME - UNTIMED_FIELDS_BEGIN].empty() |
440 ? "Not Signed In" | 440 ? "Not Signed In" |
441 : "Signed In"; | 441 : "Signed In"; |
442 AddSectionEntry(basic_info, "Chrome Version", product_version); | 442 AddSectionEntry(basic_info, "Chrome Version", product_version); |
443 AddSectionEntry(basic_info, "Signin Status", signin_status_string); | 443 AddSectionEntry(basic_info, "Signin Status", signin_status_string); |
444 AddSectionEntry(basic_info, "Web Based Signin Enabled?", | 444 AddSectionEntry(basic_info, "Web Based Signin Enabled?", |
445 switches::IsEnableWebBasedSignin() == true ? "True" : "False"); | 445 switches::IsEnableWebBasedSignin() == true ? "True" : "False"); |
| 446 AddSectionEntry(basic_info, "Webview Based Signin Enabled?", |
| 447 switches::IsEnableWebviewBasedSignin() == true ? "True" : "False"); |
446 AddSectionEntry(basic_info, "New Avatar Menu Enabled?", | 448 AddSectionEntry(basic_info, "New Avatar Menu Enabled?", |
447 switches::IsNewAvatarMenu() == true ? "True" : "False"); | 449 switches::IsNewAvatarMenu() == true ? "True" : "False"); |
448 AddSectionEntry(basic_info, "New Profile Management Enabled?", | 450 AddSectionEntry(basic_info, "New Profile Management Enabled?", |
449 switches::IsNewProfileManagement() == true ? "True" : "False"); | 451 switches::IsNewProfileManagement() == true ? "True" : "False"); |
450 AddSectionEntry(basic_info, "Account Consistency Enabled?", | 452 AddSectionEntry(basic_info, "Account Consistency Enabled?", |
451 switches::IsEnableAccountConsistency() == true ? "True" : "False"); | 453 switches::IsEnableAccountConsistency() == true ? "True" : "False"); |
452 | 454 |
453 // Only add username. SID and LSID have moved to tokens section. | 455 // Only add username. SID and LSID have moved to tokens section. |
454 const std::string field = | 456 const std::string field = |
455 SigninStatusFieldToLabel(static_cast<UntimedSigninStatusField>(USERNAME)); | 457 SigninStatusFieldToLabel(static_cast<UntimedSigninStatusField>(USERNAME)); |
(...skipping 27 matching lines...) Expand all Loading... |
483 std::sort(it->second.begin(), it->second.end(), TokenInfo::LessThan); | 485 std::sort(it->second.begin(), it->second.end(), TokenInfo::LessThan); |
484 const std::vector<TokenInfo*>& tokens = it->second; | 486 const std::vector<TokenInfo*>& tokens = it->second; |
485 for (size_t i = 0; i < tokens.size(); ++i) { | 487 for (size_t i = 0; i < tokens.size(); ++i) { |
486 base::DictionaryValue* token_info = tokens[i]->ToValue(); | 488 base::DictionaryValue* token_info = tokens[i]->ToValue(); |
487 token_details->Append(token_info); | 489 token_details->Append(token_info); |
488 } | 490 } |
489 } | 491 } |
490 | 492 |
491 return signin_status.Pass(); | 493 return signin_status.Pass(); |
492 } | 494 } |
OLD | NEW |