| Index: chrome/browser/extensions/api/system_storage/system_storage_api.cc
|
| diff --git a/chrome/browser/extensions/api/system_storage/system_storage_api.cc b/chrome/browser/extensions/api/system_storage/system_storage_api.cc
|
| index 4c2301ee6aee9f82022c9672f1c8f610822206ac..2157badefd4dcd5c1c1a93a9be66d3294ae18c47 100644
|
| --- a/chrome/browser/extensions/api/system_storage/system_storage_api.cc
|
| +++ b/chrome/browser/extensions/api/system_storage/system_storage_api.cc
|
| @@ -42,7 +42,7 @@ bool SystemStorageEjectDeviceFunction::RunImpl() {
|
| scoped_ptr<EjectDevice::Params> params(EjectDevice::Params::Create(*args_));
|
| EXTENSION_FUNCTION_VALIDATE(params.get());
|
|
|
| - chrome::StorageMonitor::GetInstance()->EnsureInitialized(base::Bind(
|
| + StorageMonitor::GetInstance()->EnsureInitialized(base::Bind(
|
| &SystemStorageEjectDeviceFunction::OnStorageMonitorInit,
|
| this,
|
| params->id));
|
| @@ -51,14 +51,14 @@ bool SystemStorageEjectDeviceFunction::RunImpl() {
|
|
|
| void SystemStorageEjectDeviceFunction::OnStorageMonitorInit(
|
| const std::string& transient_device_id) {
|
| - DCHECK(chrome::StorageMonitor::GetInstance()->IsInitialized());
|
| - chrome::StorageMonitor* monitor = chrome::StorageMonitor::GetInstance();
|
| + DCHECK(StorageMonitor::GetInstance()->IsInitialized());
|
| + StorageMonitor* monitor = StorageMonitor::GetInstance();
|
| std::string device_id_str =
|
| - chrome::StorageMonitor::GetInstance()->GetDeviceIdForTransientId(
|
| + StorageMonitor::GetInstance()->GetDeviceIdForTransientId(
|
| transient_device_id);
|
|
|
| if (device_id_str == "") {
|
| - HandleResponse(chrome::StorageMonitor::EJECT_NO_SUCH_DEVICE);
|
| + HandleResponse(StorageMonitor::EJECT_NO_SUCH_DEVICE);
|
| return;
|
| }
|
|
|
| @@ -69,21 +69,21 @@ void SystemStorageEjectDeviceFunction::OnStorageMonitorInit(
|
| }
|
|
|
| void SystemStorageEjectDeviceFunction::HandleResponse(
|
| - chrome::StorageMonitor::EjectStatus status) {
|
| + StorageMonitor::EjectStatus status) {
|
| api::system_storage:: EjectDeviceResultCode result =
|
| api::system_storage::EJECT_DEVICE_RESULT_CODE_FAILURE;
|
| switch (status) {
|
| - case chrome::StorageMonitor::EJECT_OK:
|
| + case StorageMonitor::EJECT_OK:
|
| result = api::system_storage::EJECT_DEVICE_RESULT_CODE_SUCCESS;
|
| break;
|
| - case chrome::StorageMonitor::EJECT_IN_USE:
|
| + case StorageMonitor::EJECT_IN_USE:
|
| result = api::system_storage::EJECT_DEVICE_RESULT_CODE_IN_USE;
|
| break;
|
| - case chrome::StorageMonitor::EJECT_NO_SUCH_DEVICE:
|
| + case StorageMonitor::EJECT_NO_SUCH_DEVICE:
|
| result = api::system_storage::
|
| EJECT_DEVICE_RESULT_CODE_NO_SUCH_DEVICE;
|
| break;
|
| - case chrome::StorageMonitor::EJECT_FAILURE:
|
| + case StorageMonitor::EJECT_FAILURE:
|
| result = api::system_storage::EJECT_DEVICE_RESULT_CODE_FAILURE;
|
| }
|
|
|
|
|