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

Unified Diff: chrome/browser/chromeos/extensions/file_manager/device_event_router.cc

Issue 550863003: Rename fileBrowserPrivate to fileManagerPrivate (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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
Index: chrome/browser/chromeos/extensions/file_manager/device_event_router.cc
diff --git a/chrome/browser/chromeos/extensions/file_manager/device_event_router.cc b/chrome/browser/chromeos/extensions/file_manager/device_event_router.cc
index 6a4cb4f07a31eafc5eb5b42e5b8e78d5d7ed39d7..3202ba3c6948aff47de3812dcd79bdb2aebaa7c1 100644
--- a/chrome/browser/chromeos/extensions/file_manager/device_event_router.cc
+++ b/chrome/browser/chromeos/extensions/file_manager/device_event_router.cc
@@ -10,7 +10,7 @@
namespace file_manager {
namespace {
-namespace file_browser_private = extensions::api::file_browser_private;
+namespace file_manager_private = extensions::api::file_manager_private;
using content::BrowserThread;
} // namespace
@@ -58,7 +58,7 @@ void DeviceEventRouter::OnDeviceAdded(const std::string& device_path) {
}
if (IsExternalStorageDisabled()) {
- OnDeviceEvent(file_browser_private::DEVICE_EVENT_TYPE_DISABLED,
+ OnDeviceEvent(file_manager_private::DEVICE_EVENT_TYPE_DISABLED,
device_path);
SetDeviceState(device_path, DEVICE_STATE_USUAL);
return;
@@ -77,7 +77,7 @@ void DeviceEventRouter::OnDeviceAddedDelayed(const std::string& device_path) {
DCHECK(thread_checker_.CalledOnValidThread());
if (GetDeviceState(device_path) == DEVICE_SCANNED) {
- OnDeviceEvent(file_browser_private::DEVICE_EVENT_TYPE_SCAN_STARTED,
+ OnDeviceEvent(file_manager_private::DEVICE_EVENT_TYPE_SCAN_STARTED,
device_path);
SetDeviceState(device_path, DEVICE_SCANNED_AND_REPORTED);
}
@@ -86,7 +86,7 @@ void DeviceEventRouter::OnDeviceAddedDelayed(const std::string& device_path) {
void DeviceEventRouter::OnDeviceRemoved(const std::string& device_path) {
DCHECK(thread_checker_.CalledOnValidThread());
SetDeviceState(device_path, DEVICE_STATE_USUAL);
- OnDeviceEvent(file_browser_private::DEVICE_EVENT_TYPE_REMOVED, device_path);
+ OnDeviceEvent(file_manager_private::DEVICE_EVENT_TYPE_REMOVED, device_path);
}
void DeviceEventRouter::OnDiskAdded(
@@ -98,7 +98,7 @@ void DeviceEventRouter::OnDiskAdded(
// If the disk is not being mounted, mark the device scan cancelled.
const std::string& device_path = disk.system_path_prefix();
if (GetDeviceState(device_path) == DEVICE_SCANNED_AND_REPORTED) {
- OnDeviceEvent(file_browser_private::DEVICE_EVENT_TYPE_SCAN_CANCELLED,
+ OnDeviceEvent(file_manager_private::DEVICE_EVENT_TYPE_SCAN_CANCELLED,
device_path);
}
SetDeviceState(device_path, DEVICE_STATE_USUAL);
@@ -115,7 +115,7 @@ void DeviceEventRouter::OnDiskRemoved(
const std::string& device_path = disk.system_path_prefix();
if (!disk.mount_path().empty() &&
GetDeviceState(device_path) != DEVICE_HARD_UNPLUGGED_AND_REPORTED) {
- OnDeviceEvent(file_browser_private::DEVICE_EVENT_TYPE_HARD_UNPLUGGED,
+ OnDeviceEvent(file_manager_private::DEVICE_EVENT_TYPE_HARD_UNPLUGGED,
device_path);
SetDeviceState(device_path, DEVICE_HARD_UNPLUGGED_AND_REPORTED);
}
@@ -140,10 +140,10 @@ void DeviceEventRouter::OnFormatStarted(const std::string& device_path,
DCHECK(thread_checker_.CalledOnValidThread());
if (success) {
- OnDeviceEvent(file_browser_private::DEVICE_EVENT_TYPE_FORMAT_START,
+ OnDeviceEvent(file_manager_private::DEVICE_EVENT_TYPE_FORMAT_START,
device_path);
} else {
- OnDeviceEvent(file_browser_private::DEVICE_EVENT_TYPE_FORMAT_FAIL,
+ OnDeviceEvent(file_manager_private::DEVICE_EVENT_TYPE_FORMAT_FAIL,
device_path);
}
}
@@ -152,8 +152,8 @@ void DeviceEventRouter::OnFormatCompleted(const std::string& device_path,
bool success) {
DCHECK(thread_checker_.CalledOnValidThread());
- OnDeviceEvent(success ? file_browser_private::DEVICE_EVENT_TYPE_FORMAT_SUCCESS
- : file_browser_private::DEVICE_EVENT_TYPE_FORMAT_FAIL,
+ OnDeviceEvent(success ? file_manager_private::DEVICE_EVENT_TYPE_FORMAT_SUCCESS
+ : file_manager_private::DEVICE_EVENT_TYPE_FORMAT_FAIL,
device_path);
}

Powered by Google App Engine
This is Rietveld 408576698