Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(183)

Side by Side Diff: chrome/browser/ui/webui/help/help_handler.cc

Issue 2873193002: Make update over cellular an option for user (Closed)
Patch Set: Put code in CHROME_OS wrapper to fix trybot error Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 584 matching lines...) Expand 10 before | Expand all | Expand 10 after
595 version_updater_->CheckForUpdate( 595 version_updater_->CheckForUpdate(
596 base::Bind(&HelpHandler::SetUpdateStatus, base::Unretained(this)), 596 base::Bind(&HelpHandler::SetUpdateStatus, base::Unretained(this)),
597 #if defined(OS_MACOSX) 597 #if defined(OS_MACOSX)
598 base::Bind(&HelpHandler::SetPromotionState, base::Unretained(this))); 598 base::Bind(&HelpHandler::SetPromotionState, base::Unretained(this)));
599 #else 599 #else
600 VersionUpdater::PromoteCallback()); 600 VersionUpdater::PromoteCallback());
601 #endif // OS_MACOSX 601 #endif // OS_MACOSX
602 } 602 }
603 603
604 void HelpHandler::SetUpdateStatus(VersionUpdater::Status status, 604 void HelpHandler::SetUpdateStatus(VersionUpdater::Status status,
605 int progress, const base::string16& message) { 605 int progress,
606 const std::string& /* version */,
607 int64_t /* size */,
608 const base::string16& message) {
606 // Only UPDATING state should have progress set. 609 // Only UPDATING state should have progress set.
607 DCHECK(status == VersionUpdater::UPDATING || progress == 0); 610 DCHECK(status == VersionUpdater::UPDATING || progress == 0);
608 611
609 std::string status_str; 612 std::string status_str;
610 switch (status) { 613 switch (status) {
611 case VersionUpdater::CHECKING: 614 case VersionUpdater::CHECKING:
612 status_str = "checking"; 615 status_str = "checking";
613 break; 616 break;
614 case VersionUpdater::UPDATING: 617 case VersionUpdater::UPDATING:
615 status_str = "updating"; 618 status_str = "updating";
616 break; 619 break;
617 case VersionUpdater::NEARLY_UPDATED: 620 case VersionUpdater::NEARLY_UPDATED:
618 status_str = "nearly_updated"; 621 status_str = "nearly_updated";
619 break; 622 break;
620 case VersionUpdater::UPDATED: 623 case VersionUpdater::UPDATED:
621 status_str = "updated"; 624 status_str = "updated";
622 break; 625 break;
623 case VersionUpdater::FAILED: 626 case VersionUpdater::FAILED:
624 case VersionUpdater::FAILED_OFFLINE: 627 case VersionUpdater::FAILED_OFFLINE:
625 case VersionUpdater::FAILED_CONNECTION_TYPE_DISALLOWED: 628 case VersionUpdater::FAILED_CONNECTION_TYPE_DISALLOWED:
629 // Old help page does not support update over cellular connection. Treat this
630 // signal as FAILED.
631 case VersionUpdater::NEED_PERMISSION_TO_UPDATE:
626 status_str = "failed"; 632 status_str = "failed";
627 break; 633 break;
628 case VersionUpdater::DISABLED: 634 case VersionUpdater::DISABLED:
629 status_str = "disabled"; 635 status_str = "disabled";
630 break; 636 break;
631 case VersionUpdater::DISABLED_BY_ADMIN: 637 case VersionUpdater::DISABLED_BY_ADMIN:
632 status_str = "disabled_by_admin"; 638 status_str = "disabled_by_admin";
633 break; 639 break;
634 } 640 }
635 641
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
748 base::Value("device_supported"), 754 base::Value("device_supported"),
749 base::Value("")); 755 base::Value(""));
750 } else { 756 } else {
751 web_ui()->CallJavascriptFunctionUnsafe( 757 web_ui()->CallJavascriptFunctionUnsafe(
752 "help.HelpPage.updateEolMessage", base::Value("device_endoflife"), 758 "help.HelpPage.updateEolMessage", base::Value("device_endoflife"),
753 base::Value(l10n_util::GetStringUTF16(IDS_ABOUT_PAGE_EOL_EOL))); 759 base::Value(l10n_util::GetStringUTF16(IDS_ABOUT_PAGE_EOL_EOL)));
754 } 760 }
755 } 761 }
756 762
757 #endif // defined(OS_CHROMEOS) 763 #endif // defined(OS_CHROMEOS)
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/help/help_handler.h ('k') | chrome/browser/ui/webui/help/version_updater.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698