Add extra column to details of signin-internals.

components/signin/core/browser/about_signin_internals.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/signin/core/browser/about_signin_internals.h"
 
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/hash.h"
 #include "base/i18n/time_formatting.h"
@@ skipping 24 matching lines @@
   base::ListValue* section_contents = new base::ListValue();
 
   section->SetString("title", title);
   section->Set("data", section_contents);
   parent_list->Append(section.release());
   return section_contents;
 }
 
 void AddSectionEntry(base::ListValue* section_list,
                      const std::string& field_name,
-                     const std::string& field_val) {
+                     const std::string& field_status,
+                     const std::string& field_time = "") {
   scoped_ptr<base::DictionaryValue> entry(new base::DictionaryValue());
   entry->SetString("label", field_name);
-  entry->SetString("value", field_val);
+  entry->SetString("status", field_status);
+  entry->SetString("time", field_time);
   section_list->Append(entry.release());
 }
 
 std::string SigninStatusFieldToLabel(UntimedSigninStatusField field) {
   switch (field) {
     case USERNAME:
       return "User Id";
     case UNTIMED_FIELDS_END:
       NOTREACHED();
       return std::string();
   }
   NOTREACHED();
   return std::string();
 }
 
-TimedSigninStatusValue SigninStatusFieldToLabel(TimedSigninStatusField field) {
+std::string SigninStatusFieldToLabel(TimedSigninStatusField field) {
   switch (field) {
     case SIGNIN_TYPE:
-      return TimedSigninStatusValue("Type", "Time");
+      return "Type";
     case CLIENT_LOGIN_STATUS:
-      return TimedSigninStatusValue("Last OnClientLogin Status",
-                                    "Last OnClientLogin Time");
+      return "Last OnClientLogin Status";
     case OAUTH_LOGIN_STATUS:
-      return TimedSigninStatusValue("Last OnOAuthLogin Status",
-                                    "Last OnOAuthLogin Time");
-
+      return "Last OnOAuthLogin Status";
     case GET_USER_INFO_STATUS:
-      return TimedSigninStatusValue("Last OnGetUserInfo Status",
-                                    "Last OnGetUserInfo Time");
+      return "Last OnGetUserInfo Status";
     case UBER_TOKEN_STATUS:
-      return TimedSigninStatusValue("Last OnUberToken Status",
-                                    "Last OnUberToken Time");
+      return "Last OnUberToken Status";
     case MERGE_SESSION_STATUS:
-      return TimedSigninStatusValue("Last OnMergeSession Status",
-                                    "Last OnMergeSession Time");
+      return "Last OnMergeSession Status";
     case TIMED_FIELDS_END:
       NOTREACHED();
-      return TimedSigninStatusValue("Error", std::string());
+      return "Error";
   }
   NOTREACHED();
-  return TimedSigninStatusValue("Error", std::string());
+  return "Error";
 }
 
 }  // anonymous namespace
 
 AboutSigninInternals::AboutSigninInternals(
     ProfileOAuth2TokenService* token_service,
     SigninManagerBase* signin_manager)
     : token_service_(token_service),
       signin_manager_(signin_manager),
       client_(NULL) {}
@@ skipping 263 matching lines @@
   const std::string field =
       SigninStatusFieldToLabel(static_cast<UntimedSigninStatusField>(USERNAME));
   AddSectionEntry(basic_info,
                   field,
                   untimed_signin_fields[USERNAME - UNTIMED_FIELDS_BEGIN]);
 
   // Time and status information of the possible sign in types.
   base::ListValue* detailed_info =
       AddSection(signin_info, "Last Signin Details");
   for (int i = TIMED_FIELDS_BEGIN; i < TIMED_FIELDS_END; ++i) {
-    const std::string value_field =
-        SigninStatusFieldToLabel(static_cast<TimedSigninStatusField>(i)).first;
-    const std::string time_field =
-        SigninStatusFieldToLabel(static_cast<TimedSigninStatusField>(i)).second;
+    const std::string status_field_label =
+        SigninStatusFieldToLabel(static_cast<TimedSigninStatusField>(i));
 
     AddSectionEntry(detailed_info,
-                    value_field,
-                    timed_signin_fields[i - TIMED_FIELDS_BEGIN].first);
-    AddSectionEntry(detailed_info,
-                    time_field,
+                    status_field_label,
+                    timed_signin_fields[i - TIMED_FIELDS_BEGIN].first,
                     timed_signin_fields[i - TIMED_FIELDS_BEGIN].second);
   }
 
   // Token information for all services.
   base::ListValue* token_info = new base::ListValue();
   signin_status->Set("token_info", token_info);
   for (TokenInfoMap::iterator it = token_info_map.begin();
        it != token_info_map.end();
        ++it) {
     base::ListValue* token_details = AddSection(token_info, it->first);
 
     std::sort(it->second.begin(), it->second.end(), TokenInfo::LessThan);
     const std::vector<TokenInfo*>& tokens = it->second;
     for (size_t i = 0; i < tokens.size(); ++i) {
       base::DictionaryValue* token_info = tokens[i]->ToValue();
       token_details->Append(token_info);
     }
   }
 
   return signin_status.Pass();
 }