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

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

Issue 1412453002: Remove enable-iframe-based-signin flag. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebased Created 5 years, 1 month 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 494 matching lines...) Expand 10 before | Expand all | Expand 10 after
505 FROM_HERE_WITH_EXPLICIT_FUNCTION( 505 FROM_HERE_WITH_EXPLICIT_FUNCTION(
506 "422460 AboutSigninInternals::SigninStatus::ToValue1")); 506 "422460 AboutSigninInternals::SigninStatus::ToValue1"));
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?",
516 switches::IsEnableWebviewBasedSignin() == true ? "On" : "Off");
517 AddSectionEntry(basic_info, "New Profile Management?", 515 AddSectionEntry(basic_info, "New Profile Management?",
518 switches::IsNewProfileManagement() == true ? "On" : "Off"); 516 switches::IsNewProfileManagement() == true ? "On" : "Off");
519 AddSectionEntry(basic_info, "Account Consistency?", 517 AddSectionEntry(basic_info, "Account Consistency?",
520 switches::IsEnableAccountConsistency() == true ? "On" : "Off"); 518 switches::IsEnableAccountConsistency() == true ? "On" : "Off");
521 AddSectionEntry(basic_info, "Signin Status", 519 AddSectionEntry(basic_info, "Signin Status",
522 signin_manager->IsAuthenticated() ? "Signed In" : "Not Signed In"); 520 signin_manager->IsAuthenticated() ? "Signed In" : "Not Signed In");
523 521
524 // TODO(robliao): Remove ScopedTracker below once https://crbug.com/422460 is 522 // TODO(robliao): Remove ScopedTracker below once https://crbug.com/422460 is
525 // fixed. 523 // fixed.
526 tracked_objects::ScopedTracker tracking_profile2( 524 tracked_objects::ScopedTracker tracking_profile2(
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
629 } 627 }
630 628
631 for(const std::string& account_id : accounts_in_token_service) { 629 for(const std::string& account_id : accounts_in_token_service) {
632 base::DictionaryValue* entry = new base::DictionaryValue(); 630 base::DictionaryValue* entry = new base::DictionaryValue();
633 entry->SetString("accountId", account_id); 631 entry->SetString("accountId", account_id);
634 account_info->Append(entry); 632 account_info->Append(entry);
635 } 633 }
636 634
637 return signin_status.Pass(); 635 return signin_status.Pass();
638 } 636 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698