| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/browser_about_handler.h" | 5 #include "chrome/browser/browser_about_handler.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 701 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 712 ProfileManager* profile_manager = g_browser_process->profile_manager(); | 712 ProfileManager* profile_manager = g_browser_process->profile_manager(); |
| 713 Profile* profile = profile_manager->GetDefaultProfile(user_data_dir); | 713 Profile* profile = profile_manager->GetDefaultProfile(user_data_dir); |
| 714 ProfileSyncService* service = profile->GetProfileSyncService(); | 714 ProfileSyncService* service = profile->GetProfileSyncService(); |
| 715 | 715 |
| 716 DictionaryValue strings; | 716 DictionaryValue strings; |
| 717 if (!service || !service->HasSyncSetupCompleted()) { | 717 if (!service || !service->HasSyncSetupCompleted()) { |
| 718 strings.SetString("summary", "SYNC DISABLED"); | 718 strings.SetString("summary", "SYNC DISABLED"); |
| 719 } else { | 719 } else { |
| 720 SyncManager::Status full_status(service->QueryDetailedSyncStatus()); | 720 SyncManager::Status full_status(service->QueryDetailedSyncStatus()); |
| 721 | 721 |
| 722 strings.SetString("service_url", service->sync_service_url().spec()); |
| 722 strings.SetString("summary", | 723 strings.SetString("summary", |
| 723 ProfileSyncService::BuildSyncStatusSummaryText( | 724 ProfileSyncService::BuildSyncStatusSummaryText( |
| 724 full_status.summary)); | 725 full_status.summary)); |
| 725 | 726 |
| 726 strings.Set("authenticated", | 727 strings.Set("authenticated", |
| 727 new FundamentalValue(full_status.authenticated)); | 728 new FundamentalValue(full_status.authenticated)); |
| 728 strings.SetString("auth_problem", | 729 strings.SetString("auth_problem", |
| 729 MakeSyncAuthErrorText(service->GetAuthError().state())); | 730 MakeSyncAuthErrorText(service->GetAuthError().state())); |
| 730 | 731 |
| 731 strings.SetString("time_since_sync", service->GetLastSyncedTimeString()); | 732 strings.SetString("time_since_sync", service->GetLastSyncedTimeString()); |
| (...skipping 524 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1256 // Run the dialog. This will re-use the existing one if it's already up. | 1257 // Run the dialog. This will re-use the existing one if it's already up. |
| 1257 AboutIPCDialog::RunDialog(); | 1258 AboutIPCDialog::RunDialog(); |
| 1258 return true; | 1259 return true; |
| 1259 } | 1260 } |
| 1260 #endif | 1261 #endif |
| 1261 | 1262 |
| 1262 #endif // OFFICIAL_BUILD | 1263 #endif // OFFICIAL_BUILD |
| 1263 | 1264 |
| 1264 return false; | 1265 return false; |
| 1265 } | 1266 } |
| OLD | NEW |