OLD | NEW |
---|---|
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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/views/about_chrome_view.h" | 5 #include "chrome/browser/views/about_chrome_view.h" |
6 | 6 |
7 #include <commdlg.h> | 7 #include <commdlg.h> |
8 | 8 |
9 #include "base/file_version_info.h" | 9 #include "base/file_version_info.h" |
10 #include "base/string_util.h" | 10 #include "base/string_util.h" |
(...skipping 743 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
754 // are running the latest version and if not, notify the user by falling | 754 // are running the latest version and if not, notify the user by falling |
755 // into the next case of UPGRADE_SUCCESSFUL. | 755 // into the next case of UPGRADE_SUCCESSFUL. |
756 scoped_ptr<installer::Version> installed_version( | 756 scoped_ptr<installer::Version> installed_version( |
757 InstallUtil::GetChromeVersion(false)); | 757 InstallUtil::GetChromeVersion(false)); |
758 scoped_ptr<installer::Version> running_version( | 758 scoped_ptr<installer::Version> running_version( |
759 installer::Version::GetVersionFromString(current_version_)); | 759 installer::Version::GetVersionFromString(current_version_)); |
760 if (!installed_version.get() || | 760 if (!installed_version.get() || |
761 !installed_version->IsHigherThan(running_version.get())) { | 761 !installed_version->IsHigherThan(running_version.get())) { |
762 UserMetrics::RecordAction(L"UpgradeCheck_AlreadyUpToDate", profile_); | 762 UserMetrics::RecordAction(L"UpgradeCheck_AlreadyUpToDate", profile_); |
763 check_button_status_ = CHECKBUTTON_HIDDEN; | 763 check_button_status_ = CHECKBUTTON_HIDDEN; |
764 update_label_.SetText( | 764 std::wstring update_label_text = |
765 l10n_util::GetStringF(IDS_UPGRADE_ALREADY_UP_TO_DATE, | 765 l10n_util::GetStringF(IDS_UPGRADE_ALREADY_UP_TO_DATE, |
766 l10n_util::GetString(IDS_PRODUCT_NAME), | 766 l10n_util::GetString(IDS_PRODUCT_NAME), |
767 current_version_)); | 767 current_version_); |
768 if (l10n_util::GetTextDirection() == l10n_util::RIGHT_TO_LEFT) { | |
769 update_label_text.push_back(static_cast<wchar_t>(l10n_util::kLeftToRig htMark)); | |
idana
2009/03/26 06:06:17
Line exceeds 80 characters.
| |
770 } | |
771 update_label_.SetText(update_label_text); | |
768 show_success_indicator = true; | 772 show_success_indicator = true; |
769 break; | 773 break; |
770 } | 774 } |
771 // No break here as we want to notify user about upgrade if there is one. | 775 // No break here as we want to notify user about upgrade if there is one. |
772 } | 776 } |
773 case UPGRADE_SUCCESSFUL: { | 777 case UPGRADE_SUCCESSFUL: { |
774 if (result == UPGRADE_ALREADY_UP_TO_DATE) | 778 if (result == UPGRADE_ALREADY_UP_TO_DATE) |
775 UserMetrics::RecordAction(L"UpgradeCheck_AlreadyUpgraded", profile_); | 779 UserMetrics::RecordAction(L"UpgradeCheck_AlreadyUpgraded", profile_); |
776 else | 780 else |
777 UserMetrics::RecordAction(L"UpgradeCheck_Upgraded", profile_); | 781 UserMetrics::RecordAction(L"UpgradeCheck_Upgraded", profile_); |
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
810 | 814 |
811 // We have updated controls on the parent, so we need to update its layout. | 815 // We have updated controls on the parent, so we need to update its layout. |
812 View* parent = GetParent(); | 816 View* parent = GetParent(); |
813 parent->Layout(); | 817 parent->Layout(); |
814 | 818 |
815 // Check button may have appeared/disappeared. We cannot call this during | 819 // Check button may have appeared/disappeared. We cannot call this during |
816 // ViewHierarchyChanged because the |window()| pointer hasn't been set yet. | 820 // ViewHierarchyChanged because the |window()| pointer hasn't been set yet. |
817 if (window()) | 821 if (window()) |
818 GetDialogClientView()->UpdateDialogButtons(); | 822 GetDialogClientView()->UpdateDialogButtons(); |
819 } | 823 } |
OLD | NEW |