Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(765)

Side by Side Diff: components/signin/core/browser/about_signin_internals.cc

Issue 872433006: Disconnect one click sign in code. The code itself will be removed in followup (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix merge Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 430 matching lines...) Expand 10 before | Expand all | Expand 10 after
441 signin_status->Set("signin_info", signin_info); 441 signin_status->Set("signin_info", signin_info);
442 442
443 // A summary of signin related info first. 443 // A summary of signin related info first.
444 base::ListValue* basic_info = AddSection(signin_info, "Basic Information"); 444 base::ListValue* basic_info = AddSection(signin_info, "Basic Information");
445 const std::string signin_status_string = 445 const std::string signin_status_string =
446 untimed_signin_fields[USERNAME - UNTIMED_FIELDS_BEGIN].empty() 446 untimed_signin_fields[USERNAME - UNTIMED_FIELDS_BEGIN].empty()
447 ? "Not Signed In" 447 ? "Not Signed In"
448 : "Signed In"; 448 : "Signed In";
449 AddSectionEntry(basic_info, "Chrome Version", product_version); 449 AddSectionEntry(basic_info, "Chrome Version", product_version);
450 AddSectionEntry(basic_info, "Signin Status", signin_status_string); 450 AddSectionEntry(basic_info, "Signin Status", signin_status_string);
451 AddSectionEntry(basic_info, "Web Based Signin Enabled?",
452 switches::IsEnableWebBasedSignin() == true ? "True" : "False");
453 AddSectionEntry(basic_info, "Webview Based Signin Enabled?", 451 AddSectionEntry(basic_info, "Webview Based Signin Enabled?",
454 switches::IsEnableWebviewBasedSignin() == true ? "True" : "False"); 452 switches::IsEnableWebviewBasedSignin() == true ? "True" : "False");
455 AddSectionEntry(basic_info, "New Avatar Menu Enabled?", 453 AddSectionEntry(basic_info, "New Avatar Menu Enabled?",
456 switches::IsNewAvatarMenu() == true ? "True" : "False"); 454 switches::IsNewAvatarMenu() == true ? "True" : "False");
457 AddSectionEntry(basic_info, "New Profile Management Enabled?", 455 AddSectionEntry(basic_info, "New Profile Management Enabled?",
458 switches::IsNewProfileManagement() == true ? "True" : "False"); 456 switches::IsNewProfileManagement() == true ? "True" : "False");
459 AddSectionEntry(basic_info, "Account Consistency Enabled?", 457 AddSectionEntry(basic_info, "Account Consistency Enabled?",
460 switches::IsEnableAccountConsistency() == true ? "True" : "False"); 458 switches::IsEnableAccountConsistency() == true ? "True" : "False");
461 459
462 // Only add username. SID and LSID have moved to tokens section. 460 // Only add username. SID and LSID have moved to tokens section.
(...skipping 29 matching lines...) Expand all
492 const std::vector<TokenInfo*>& tokens = it->second; 490 const std::vector<TokenInfo*>& tokens = it->second;
493 491
494 for (size_t i = 0; i < tokens.size(); ++i) { 492 for (size_t i = 0; i < tokens.size(); ++i) {
495 base::DictionaryValue* token_info = tokens[i]->ToValue(); 493 base::DictionaryValue* token_info = tokens[i]->ToValue();
496 token_details->Append(token_info); 494 token_details->Append(token_info);
497 } 495 }
498 } 496 }
499 497
500 return signin_status.Pass(); 498 return signin_status.Pass();
501 } 499 }
OLDNEW
« no previous file with comments | « chrome/test/remoting/remote_desktop_browsertest.cc ('k') | components/signin/core/common/profile_management_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698