Storage manager: Add conditional messages for disk low situation and update design.

chrome/browser/ui/webui/options/chromeos/storage_manager_handler.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/options/chromeos/storage_manager_handler.h"
 
 #include <string>
 
 #include "base/files/file_util.h"
 #include "base/sys_info.h"
@@ skipping 15 matching lines @@
                                int64_t* total_size,
                                int64_t* available_size) {
   int64_t size = base::SysInfo::AmountOfTotalDiskSpace(mount_path);
   if (size >= 0)
     *total_size = size;
   size = base::SysInfo::AmountOfFreeDiskSpace(mount_path);
   if (size >= 0)
     *available_size = size;
 }
 
+// Threshold to show a message indicatiog space is critically low (512 MB).

[Dan Beam, 2016/06/21 01:39:56]

indicatiog -> indicating

[fukino, 2016/06/21 22:21:50]

Done.

+const int64_t kSpaceCriticallyLowBytes = 512LL << 20;

[Dan Beam, 2016/06/21 01:39:56]

512 * 1024 * 1024 

would probably be more explanatory, IMO

[fukino, 2016/06/21 22:21:49]

Done.

+
+// Threshold to show a message indicatiog space is low (1 GB).
+const int64_t kSpaceLowBytes = 1LL << 30;

[Dan Beam, 2016/06/21 01:39:56]

same here:

1 * 1024 * 1024 * 1024

[fukino, 2016/06/21 22:21:49]

Done.

+
 }  // namespace
 
 StorageManagerHandler::StorageManagerHandler() : weak_ptr_factory_(this) {
 }
 
 StorageManagerHandler::~StorageManagerHandler() {
 }
 
 void StorageManagerHandler::GetLocalizedValues(
     base::DictionaryValue* localized_strings) {
@@ skipping 13 matching lines @@
           IDS_OPTIONS_SETTINGS_STORAGE_ITEM_LABEL_AVAILABLE));
   localized_strings->SetString(
       "storageSubitemLabelDownloads", l10n_util::GetStringUTF16(
           IDS_OPTIONS_SETTINGS_STORAGE_SUBITEM_LABEL_DOWNLOADS));
   localized_strings->SetString(
       "storageSubitemLabelArc", l10n_util::GetStringUTF16(
           IDS_OPTIONS_SETTINGS_STORAGE_SUBITEM_LABEL_ARC));
   localized_strings->SetString(
       "storageSizeCalculating", l10n_util::GetStringUTF16(
           IDS_OPTIONS_SETTINGS_STORAGE_SIZE_CALCULATING));
+  localized_strings->SetString(
+      "storageLowMessageTitle", l10n_util::GetStringUTF16(
+          IDS_OPTIONS_SETTINGS_STORAGE_SPACE_LOW_MESSAGE_TITLE));
+  localized_strings->SetString(
+      "storageLowMessageLine1", l10n_util::GetStringUTF16(
+          IDS_OPTIONS_SETTINGS_STORAGE_SPACE_LOW_MESSAGE_LINE_1));
+  localized_strings->SetString(
+      "storageLowMessageLine2", l10n_util::GetStringUTF16(
+          IDS_OPTIONS_SETTINGS_STORAGE_SPACE_LOW_MESSAGE_LINE_2));
+  localized_strings->SetString(
+      "storageCriticallyLowMessageTitle", l10n_util::GetStringUTF16(
+          IDS_OPTIONS_SETTINGS_STORAGE_SPACE_CRITICALLY_LOW_MESSAGE_TITLE));
+  localized_strings->SetString(
+      "storageCriticallyLowMessageLine1", l10n_util::GetStringUTF16(
+          IDS_OPTIONS_SETTINGS_STORAGE_SPACE_CRITICALLY_LOW_MESSAGE_LINE_1));
+  localized_strings->SetString(
+      "storageCriticallyLowMessageLine2", l10n_util::GetStringUTF16(
+          IDS_OPTIONS_SETTINGS_STORAGE_SPACE_CRITICALLY_LOW_MESSAGE_LINE_2));
 }
 
 void StorageManagerHandler::InitializePage() {
   DCHECK(web_ui());
 }
 
 void StorageManagerHandler::RegisterMessages() {
   DCHECK(web_ui());
 
   web_ui()->RegisterMessageCallback(
@@ skipping 55 matching lines @@
 
 void StorageManagerHandler::OnGetSizeStat(int64_t* total_size,
                                           int64_t* available_size) {
   int64_t used_size = *total_size - *available_size;
   base::DictionaryValue size_stat;
   size_stat.SetString("totalSize", ui::FormatBytes(*total_size));
   size_stat.SetString("availableSize", ui::FormatBytes(*available_size));
   size_stat.SetString("usedSize", ui::FormatBytes(used_size));
   size_stat.SetDouble("usedRatio",
                       static_cast<double>(used_size) / *total_size);
+  size_stat.SetBoolean("isSpaceLow", *available_size < kSpaceLowBytes);

[Dan Beam, 2016/06/21 01:39:56]

nit: maybe make an enum?

[fukino, 2016/06/21 22:21:49]

Done.

+  size_stat.SetBoolean("isSpaceCriticallyLow",
+                       *available_size < kSpaceCriticallyLowBytes);
   web_ui()->CallJavascriptFunctionUnsafe(
       "options.StorageManager.setSizeStat", size_stat);
 }
 
 void StorageManagerHandler::UpdateDownloadsSize() {
   Profile* const profile = Profile::FromWebUI(web_ui());
   const base::FilePath downloads_path =
       file_manager::util::GetDownloadsFolderForProfile(profile);
 
   base::PostTaskAndReplyWithResult(
@@ skipping 43 matching lines @@
                            size->total_data_bytes +
                            size->total_cache_bytes;
     arc_size = base::StringValue(ui::FormatBytes(total_bytes));
   }
   web_ui()->CallJavascriptFunctionUnsafe("options.StorageManager.setArcSize",
                                          arc_size);
 }
 
 }  // namespace options
 }  // namespace chromeos