| 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 "chrome/browser/sync/about_sync_util.h" | 5 #include "chrome/browser/sync/about_sync_util.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "base/strings/string16.h" | 9 #include "base/strings/string16.h" |
| 10 #include "base/values.h" | 10 #include "base/values.h" |
| (...skipping 317 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 328 encrypted_types.SetValue( | 328 encrypted_types.SetValue( |
| 329 ModelTypeSetToString(full_status.encrypted_types)); | 329 ModelTypeSetToString(full_status.encrypted_types)); |
| 330 has_keystore_key.SetValue(full_status.has_keystore_key); | 330 has_keystore_key.SetValue(full_status.has_keystore_key); |
| 331 keystore_migration_time.SetValue( | 331 keystore_migration_time.SetValue( |
| 332 GetTimeStr(full_status.keystore_migration_time, "Not Migrated")); | 332 GetTimeStr(full_status.keystore_migration_time, "Not Migrated")); |
| 333 passphrase_type.SetValue( | 333 passphrase_type.SetValue( |
| 334 PassphraseTypeToString(full_status.passphrase_type)); | 334 PassphraseTypeToString(full_status.passphrase_type)); |
| 335 } | 335 } |
| 336 | 336 |
| 337 if (snapshot.is_initialized()) { | 337 if (snapshot.is_initialized()) { |
| 338 session_source.SetValue( | 338 if (snapshot.legacy_updates_source() != |
| 339 syncer::GetUpdatesSourceString(snapshot.source().updates_source)); | 339 sync_pb::GetUpdatesCallerInfo::UNKNOWN) { |
| 340 session_source.SetValue( |
| 341 syncer::GetUpdatesSourceString(snapshot.legacy_updates_source())); |
| 342 } |
| 340 get_key_result.SetValue( | 343 get_key_result.SetValue( |
| 341 GetSyncerErrorString( | 344 GetSyncerErrorString( |
| 342 snapshot.model_neutral_state().last_get_key_result)); | 345 snapshot.model_neutral_state().last_get_key_result)); |
| 343 download_result.SetValue( | 346 download_result.SetValue( |
| 344 GetSyncerErrorString( | 347 GetSyncerErrorString( |
| 345 snapshot.model_neutral_state().last_download_updates_result)); | 348 snapshot.model_neutral_state().last_download_updates_result)); |
| 346 commit_result.SetValue( | 349 commit_result.SetValue( |
| 347 GetSyncerErrorString( | 350 GetSyncerErrorString( |
| 348 snapshot.model_neutral_state().commit_result)); | 351 snapshot.model_neutral_state().commit_result)); |
| 349 } | 352 } |
| (...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 436 about_info->SetString("unrecoverable_error_message", | 439 about_info->SetString("unrecoverable_error_message", |
| 437 unrecoverable_error_message); | 440 unrecoverable_error_message); |
| 438 } | 441 } |
| 439 | 442 |
| 440 about_info->Set("type_status", service->GetTypeStatusMap()); | 443 about_info->Set("type_status", service->GetTypeStatusMap()); |
| 441 | 444 |
| 442 return about_info.Pass(); | 445 return about_info.Pass(); |
| 443 } | 446 } |
| 444 | 447 |
| 445 } // namespace sync_ui_util | 448 } // namespace sync_ui_util |
| OLD | NEW |