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/ui/webui/help/help_handler.h" | 5 #include "chrome/browser/ui/webui/help/help_handler.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include <string> | 9 #include <string> |
10 | 10 |
(...skipping 587 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
598 version_updater_->CheckForUpdate( | 598 version_updater_->CheckForUpdate( |
599 base::Bind(&HelpHandler::SetUpdateStatus, base::Unretained(this)), | 599 base::Bind(&HelpHandler::SetUpdateStatus, base::Unretained(this)), |
600 #if defined(OS_MACOSX) | 600 #if defined(OS_MACOSX) |
601 base::Bind(&HelpHandler::SetPromotionState, base::Unretained(this))); | 601 base::Bind(&HelpHandler::SetPromotionState, base::Unretained(this))); |
602 #else | 602 #else |
603 VersionUpdater::PromoteCallback()); | 603 VersionUpdater::PromoteCallback()); |
604 #endif // OS_MACOSX | 604 #endif // OS_MACOSX |
605 } | 605 } |
606 | 606 |
607 void HelpHandler::SetUpdateStatus(VersionUpdater::Status status, | 607 void HelpHandler::SetUpdateStatus(VersionUpdater::Status status, |
608 int progress, const base::string16& message) { | 608 int progress, |
| 609 const std::string& version, |
| 610 const int64_t size, |
| 611 const base::string16& message) { |
609 // Only UPDATING state should have progress set. | 612 // Only UPDATING state should have progress set. |
610 DCHECK(status == VersionUpdater::UPDATING || progress == 0); | 613 DCHECK(status == VersionUpdater::UPDATING || progress == 0); |
611 | 614 |
612 std::string status_str; | 615 std::string status_str; |
613 switch (status) { | 616 switch (status) { |
614 case VersionUpdater::CHECKING: | 617 case VersionUpdater::CHECKING: |
615 status_str = "checking"; | 618 status_str = "checking"; |
616 break; | 619 break; |
617 case VersionUpdater::UPDATING: | 620 case VersionUpdater::UPDATING: |
618 status_str = "updating"; | 621 status_str = "updating"; |
619 break; | 622 break; |
620 case VersionUpdater::NEARLY_UPDATED: | 623 case VersionUpdater::NEARLY_UPDATED: |
621 status_str = "nearly_updated"; | 624 status_str = "nearly_updated"; |
622 break; | 625 break; |
623 case VersionUpdater::UPDATED: | 626 case VersionUpdater::UPDATED: |
624 status_str = "updated"; | 627 status_str = "updated"; |
625 break; | 628 break; |
626 case VersionUpdater::FAILED: | 629 case VersionUpdater::FAILED: |
627 case VersionUpdater::FAILED_OFFLINE: | 630 case VersionUpdater::FAILED_OFFLINE: |
628 case VersionUpdater::FAILED_CONNECTION_TYPE_DISALLOWED: | 631 case VersionUpdater::FAILED_CONNECTION_TYPE_DISALLOWED: |
| 632 // Old help page does not support update over cellular connection. Treat this |
| 633 // signal as FAILED. |
| 634 case VersionUpdater::NEED_PERMISSION_TO_UPDATE: |
629 status_str = "failed"; | 635 status_str = "failed"; |
630 break; | 636 break; |
631 case VersionUpdater::DISABLED: | 637 case VersionUpdater::DISABLED: |
632 status_str = "disabled"; | 638 status_str = "disabled"; |
633 break; | 639 break; |
634 case VersionUpdater::DISABLED_BY_ADMIN: | 640 case VersionUpdater::DISABLED_BY_ADMIN: |
635 status_str = "disabled_by_admin"; | 641 status_str = "disabled_by_admin"; |
636 break; | 642 break; |
637 } | 643 } |
638 | 644 |
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
752 base::Value("device_supported"), | 758 base::Value("device_supported"), |
753 base::Value("")); | 759 base::Value("")); |
754 } else { | 760 } else { |
755 web_ui()->CallJavascriptFunctionUnsafe( | 761 web_ui()->CallJavascriptFunctionUnsafe( |
756 "help.HelpPage.updateEolMessage", base::Value("device_endoflife"), | 762 "help.HelpPage.updateEolMessage", base::Value("device_endoflife"), |
757 base::Value(l10n_util::GetStringUTF16(IDS_ABOUT_PAGE_EOL_EOL))); | 763 base::Value(l10n_util::GetStringUTF16(IDS_ABOUT_PAGE_EOL_EOL))); |
758 } | 764 } |
759 } | 765 } |
760 | 766 |
761 #endif // defined(OS_CHROMEOS) | 767 #endif // defined(OS_CHROMEOS) |
OLD | NEW |