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

Unified Diff: chrome/browser/ui/webui/chromeos/login/encryption_migration_screen_handler.cc

Issue 2902093003: arc: Message for a low-battery case of migration notification. (Closed)
Patch Set: Fix typo 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/chromeos/arc/arc_migration_guide_notification.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/chromeos/login/encryption_migration_screen_handler.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/encryption_migration_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/encryption_migration_screen_handler.cc
index c63f247b7e35d5ffae68d0de34e9a99751c4d9b2..ba010d5bcdaca618f9beb600d62787ed564f324f 100644
--- a/chrome/browser/ui/webui/chromeos/login/encryption_migration_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/encryption_migration_screen_handler.cc
@@ -17,6 +17,7 @@
#include "base/sys_info.h"
#include "base/task_scheduler/post_task.h"
#include "chrome/browser/browser_process.h"
+#include "chrome/browser/chromeos/arc/arc_migration_constants.h"
#include "chrome/browser/chromeos/login/ui/login_feedback.h"
#include "chrome/browser/lifetime/application_lifetime.h"
#include "chrome/browser/profiles/profile.h"
@@ -41,12 +42,6 @@ constexpr char kJsScreenPath[] = "login.EncryptionMigrationScreen";
// Path to the mount point to check the available space.
constexpr char kCheckStoragePath[] = "/home";
-// The minimum size of available space to start the migration.
-constexpr int64_t kMinimumAvailableStorage = 10LL * 1024 * 1024; // 10MB
-
-// The minimum battery level to start the migration.
-constexpr double kMinimumBatteryPercent = 30;
-
// JS API callbacks names.
constexpr char kJsApiStartMigration[] = "startMigration";
constexpr char kJsApiSkipMigration[] = "skipMigration";
@@ -219,13 +214,13 @@ void EncryptionMigrationScreenHandler::PowerChanged(
const power_manager::PowerSupplyProperties& proto) {
current_battery_percent_ = proto.battery_percent();
CallJS("setBatteryState", current_battery_percent_,
- current_battery_percent_ >= kMinimumBatteryPercent,
+ current_battery_percent_ >= arc::kMigrationMinimumBatteryPercent,
proto.battery_state() ==
power_manager::PowerSupplyProperties_BatteryState_CHARGING);
// If the migration was already requested and the bettery level is enough now,
// The migration should start immediately.
- if (current_battery_percent_ >= kMinimumBatteryPercent &&
+ if (current_battery_percent_ >= arc::kMigrationMinimumBatteryPercent &&
should_migrate_on_enough_battery_) {
should_migrate_on_enough_battery_ = false;
StartMigration();
@@ -292,7 +287,7 @@ void EncryptionMigrationScreenHandler::CheckAvailableStorage() {
}
void EncryptionMigrationScreenHandler::OnGetAvailableStorage(int64_t size) {
- if (size >= kMinimumAvailableStorage || IsTestingUI()) {
+ if (size >= arc::kMigrationMinimumAvailableStorage || IsTestingUI()) {
if (should_resume_) {
RecordFirstScreen(FirstScreen::FIRST_SCREEN_RESUME);
WaitBatteryAndMigrate();
@@ -304,13 +299,13 @@ void EncryptionMigrationScreenHandler::OnGetAvailableStorage(int64_t size) {
RecordFirstScreen(FirstScreen::FIRST_SCREEN_LOW_STORAGE);
CallJS("setAvailableSpaceInString", ui::FormatBytes(size));
CallJS("setNecessarySpaceInString",
- ui::FormatBytes(kMinimumAvailableStorage));
+ ui::FormatBytes(arc::kMigrationMinimumAvailableStorage));
UpdateUIState(UIState::NOT_ENOUGH_STORAGE);
}
}
void EncryptionMigrationScreenHandler::WaitBatteryAndMigrate() {
- if (current_battery_percent_ >= kMinimumBatteryPercent) {
+ if (current_battery_percent_ >= arc::kMigrationMinimumBatteryPercent) {
StartMigration();
return;
}
« no previous file with comments | « chrome/browser/chromeos/arc/arc_migration_guide_notification.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698