OLD | NEW |
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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 <string> | 7 #include <string> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "app/l10n_util.h" | 10 #include "app/l10n_util.h" |
11 #include "app/resource_bundle.h" | 11 #include "app/resource_bundle.h" |
12 #include "base/file_version_info.h" | 12 #include "base/file_version_info.h" |
13 #include "base/histogram.h" | 13 #include "base/histogram.h" |
| 14 #include "base/i18n/number_formatting.h" |
14 #include "base/path_service.h" | 15 #include "base/path_service.h" |
15 #include "base/platform_thread.h" | 16 #include "base/platform_thread.h" |
16 #include "base/stats_table.h" | 17 #include "base/stats_table.h" |
17 #include "base/string_piece.h" | 18 #include "base/string_piece.h" |
18 #include "base/string_util.h" | 19 #include "base/string_util.h" |
19 #include "base/thread.h" | 20 #include "base/thread.h" |
20 #include "base/tracked_objects.h" | 21 #include "base/tracked_objects.h" |
21 #include "chrome/browser/browser.h" | 22 #include "chrome/browser/browser.h" |
22 #include "chrome/browser/browser_process.h" | 23 #include "chrome/browser/browser_process.h" |
23 #include "chrome/browser/dom_ui/chrome_url_data_manager.h" | 24 #include "chrome/browser/dom_ui/chrome_url_data_manager.h" |
(...skipping 413 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
437 DictionaryValue* val = new DictionaryValue; | 438 DictionaryValue* val = new DictionaryValue; |
438 val->SetString(L"stat_name", stat_name); | 439 val->SetString(L"stat_name", stat_name); |
439 val->SetBoolean(L"stat_value", stat_value); | 440 val->SetBoolean(L"stat_value", stat_value); |
440 details->Append(val); | 441 details->Append(val); |
441 } | 442 } |
442 | 443 |
443 static void AddIntSyncDetail(ListValue* details, const std::wstring& stat_name, | 444 static void AddIntSyncDetail(ListValue* details, const std::wstring& stat_name, |
444 int64 stat_value) { | 445 int64 stat_value) { |
445 DictionaryValue* val = new DictionaryValue; | 446 DictionaryValue* val = new DictionaryValue; |
446 val->SetString(L"stat_name", stat_name); | 447 val->SetString(L"stat_name", stat_name); |
447 val->SetString(L"stat_value", FormatNumber(stat_value)); | 448 val->SetString(L"stat_value", UTF16ToWide(base::FormatNumber(stat_value))); |
448 details->Append(val); | 449 details->Append(val); |
449 } | 450 } |
450 | 451 |
451 static std::wstring MakeSyncAuthErrorText(AuthErrorState state) { | 452 static std::wstring MakeSyncAuthErrorText(AuthErrorState state) { |
452 switch (state) { | 453 switch (state) { |
453 case AUTH_ERROR_INVALID_GAIA_CREDENTIALS: | 454 case AUTH_ERROR_INVALID_GAIA_CREDENTIALS: |
454 return L"INVALID_GAIA_CREDENTIALS"; | 455 return L"INVALID_GAIA_CREDENTIALS"; |
455 case AUTH_ERROR_USER_NOT_SIGNED_UP: | 456 case AUTH_ERROR_USER_NOT_SIGNED_UP: |
456 return L"USER_NOT_SIGNED_UP"; | 457 return L"USER_NOT_SIGNED_UP"; |
457 case AUTH_ERROR_CONNECTION_FAILED: | 458 case AUTH_ERROR_CONNECTION_FAILED: |
(...skipping 404 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
862 // Run the dialog. This will re-use the existing one if it's already up. | 863 // Run the dialog. This will re-use the existing one if it's already up. |
863 AboutIPCDialog::RunDialog(); | 864 AboutIPCDialog::RunDialog(); |
864 return true; | 865 return true; |
865 } | 866 } |
866 #endif | 867 #endif |
867 | 868 |
868 #endif // OFFICIAL_BUILD | 869 #endif // OFFICIAL_BUILD |
869 | 870 |
870 return false; | 871 return false; |
871 } | 872 } |
OLD | NEW |