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

Unified Diff: chrome/browser/extensions/api/system_info/system_info_api.cc

Issue 23727009: Cleanup: Remove chrome namespace for storage monitor and media galleries. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix nit Created 7 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/extensions/api/system_info/system_info_api.cc
diff --git a/chrome/browser/extensions/api/system_info/system_info_api.cc b/chrome/browser/extensions/api/system_info/system_info_api.cc
index fd0dcaf2e807a875abffb6e58acd1872037531c2..fc2989064e3c26b5f9250a6a8dca7cbbb2627dc2 100644
--- a/chrome/browser/extensions/api/system_info/system_info_api.cc
+++ b/chrome/browser/extensions/api/system_info/system_info_api.cc
@@ -44,7 +44,7 @@ bool IsDisplayChangedEvent(const std::string& event_name) {
// Event router for systemInfo API. It is a singleton instance shared by
// multiple profiles.
class SystemInfoEventRouter : public gfx::DisplayObserver,
- public chrome::RemovableStorageObserver {
+ public RemovableStorageObserver {
public:
static SystemInfoEventRouter* GetInstance();
@@ -61,11 +61,9 @@ class SystemInfoEventRouter : public gfx::DisplayObserver,
virtual void OnDisplayAdded(const gfx::Display& new_display) OVERRIDE;
virtual void OnDisplayRemoved(const gfx::Display& old_display) OVERRIDE;
- // chrome::RemovableStorageObserver implementation.
- virtual void OnRemovableStorageAttached(
- const chrome::StorageInfo& info) OVERRIDE;
- virtual void OnRemovableStorageDetached(
- const chrome::StorageInfo& info) OVERRIDE;
+ // RemovableStorageObserver implementation.
+ virtual void OnRemovableStorageAttached(const StorageInfo& info) OVERRIDE;
+ virtual void OnRemovableStorageDetached(const StorageInfo& info) OVERRIDE;
// Called from any thread to dispatch the systemInfo event to all extension
// processes cross multiple profiles.
@@ -90,12 +88,11 @@ SystemInfoEventRouter* SystemInfoEventRouter::GetInstance() {
}
SystemInfoEventRouter::SystemInfoEventRouter() {
- chrome::StorageMonitor::GetInstance()->AddObserver(this);
+ StorageMonitor::GetInstance()->AddObserver(this);
}
SystemInfoEventRouter::~SystemInfoEventRouter() {
- if (chrome::StorageMonitor* storage_monitor =
- chrome::StorageMonitor::GetInstance())
+ if (StorageMonitor* storage_monitor = StorageMonitor::GetInstance())
storage_monitor->RemoveObserver(this);
}
@@ -134,7 +131,7 @@ void SystemInfoEventRouter::RemoveEventListener(
}
void SystemInfoEventRouter::OnRemovableStorageAttached(
- const chrome::StorageInfo& info) {
+ const StorageInfo& info) {
StorageUnitInfo unit;
systeminfo::BuildStorageUnitInfo(info, &unit);
scoped_ptr<base::ListValue> args(new base::ListValue);
@@ -143,9 +140,9 @@ void SystemInfoEventRouter::OnRemovableStorageAttached(
}
void SystemInfoEventRouter::OnRemovableStorageDetached(
- const chrome::StorageInfo& info) {
+ const StorageInfo& info) {
scoped_ptr<base::ListValue> args(new base::ListValue);
- args->Append(new base::StringValue(chrome::StorageMonitor::GetInstance()->
+ args->Append(new base::StringValue(StorageMonitor::GetInstance()->
GetTransientIdForDeviceId(info.device_id())));
DispatchEvent(system_storage::OnDetached::kEventName, args.Pass());

Powered by Google App Engine
This is Rietveld 408576698