| Index: chrome/browser/extensions/api/system_info_storage/system_info_storage_api.cc
|
| diff --git a/chrome/browser/extensions/api/system_info_storage/system_info_storage_api.cc b/chrome/browser/extensions/api/system_info_storage/system_info_storage_api.cc
|
| index 8249eaa8b566533a638bcd9eb3e856b09f2a7329..9833fa839a9767b2a5c09b13e2ef064c7863ad50 100644
|
| --- a/chrome/browser/extensions/api/system_info_storage/system_info_storage_api.cc
|
| +++ b/chrome/browser/extensions/api/system_info_storage/system_info_storage_api.cc
|
| @@ -5,8 +5,8 @@
|
|
|
| namespace extensions {
|
|
|
| -using api::experimental_system_info_storage::StorageUnitInfo;
|
| -namespace EjectDevice = api::experimental_system_info_storage::EjectDevice;
|
| +using api::system_info_storage::StorageUnitInfo;
|
| +namespace EjectDevice = api::system_info_storage::EjectDevice;
|
|
|
| SystemInfoStorageGetFunction::SystemInfoStorageGetFunction() {
|
| }
|
| @@ -23,9 +23,8 @@ bool SystemInfoStorageGetFunction::RunImpl() {
|
|
|
| void SystemInfoStorageGetFunction::OnGetStorageInfoCompleted(bool success) {
|
| if (success) {
|
| - results_ =
|
| - api::experimental_system_info_storage::Get::Results::Create(
|
| - StorageInfoProvider::Get()->storage_unit_info_list());
|
| + results_ = api::system_info_storage::Get::Results::Create(
|
| + StorageInfoProvider::Get()->storage_unit_info_list());
|
| } else {
|
| SetError("Error occurred when querying storage information.");
|
| }
|
| @@ -70,28 +69,25 @@ void SystemInfoStorageEjectDeviceFunction::OnStorageMonitorInit(
|
|
|
| void SystemInfoStorageEjectDeviceFunction::HandleResponse(
|
| chrome::StorageMonitor::EjectStatus status) {
|
| - api::experimental_system_info_storage:: EjectDeviceResultCode result =
|
| - api::experimental_system_info_storage::EJECT_DEVICE_RESULT_CODE_FAILURE;
|
| + api::system_info_storage:: EjectDeviceResultCode result =
|
| + api::system_info_storage::EJECT_DEVICE_RESULT_CODE_FAILURE;
|
| switch (status) {
|
| case chrome::StorageMonitor::EJECT_OK:
|
| - result = api::experimental_system_info_storage::
|
| - EJECT_DEVICE_RESULT_CODE_SUCCESS;
|
| + result = api::system_info_storage::EJECT_DEVICE_RESULT_CODE_SUCCESS;
|
| break;
|
| case chrome::StorageMonitor::EJECT_IN_USE:
|
| - result = api::experimental_system_info_storage::
|
| - EJECT_DEVICE_RESULT_CODE_IN_USE;
|
| + result = api::system_info_storage::EJECT_DEVICE_RESULT_CODE_IN_USE;
|
| break;
|
| case chrome::StorageMonitor::EJECT_NO_SUCH_DEVICE:
|
| - result = api::experimental_system_info_storage::
|
| + result = api::system_info_storage::
|
| EJECT_DEVICE_RESULT_CODE_NO_SUCH_DEVICE;
|
| break;
|
| case chrome::StorageMonitor::EJECT_FAILURE:
|
| - result = api::experimental_system_info_storage::
|
| - EJECT_DEVICE_RESULT_CODE_FAILURE;
|
| + result = api::system_info_storage::EJECT_DEVICE_RESULT_CODE_FAILURE;
|
| }
|
|
|
| SetResult(base::StringValue::CreateStringValue(
|
| - api::experimental_system_info_storage::ToString(result)));
|
| + api::system_info_storage::ToString(result)));
|
| SendResponse(true);
|
| }
|
|
|
|
|