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

Unified Diff: chrome/browser/storage_monitor/storage_monitor.cc

Issue 19489006: Media Galleries: Move gallery name generation back to StorageMonitor. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: rebase Created 7 years, 4 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/storage_monitor/storage_monitor.cc
===================================================================
--- chrome/browser/storage_monitor/storage_monitor.cc (revision 218837)
+++ chrome/browser/storage_monitor/storage_monitor.cc (working copy)
@@ -45,10 +45,7 @@
}
StorageMonitor* StorageMonitor::GetInstance() {
- if (g_browser_process)
- return g_browser_process->storage_monitor();
-
- return NULL;
+ return g_browser_process ? g_browser_process->storage_monitor() : NULL;
}
std::vector<StorageInfo> StorageMonitor::GetAllAvailableStorages() const {
@@ -149,8 +146,7 @@
storage_map_.insert(std::make_pair(info.device_id(), info));
}
- DVLOG(1) << "StorageAttached with name " << UTF16ToUTF8(info.name())
- << " and id " << info.device_id();
+ DVLOG(1) << "StorageAttached with id " << info.device_id();
if (StorageInfo::IsRemovableDevice(info.device_id())) {
observer_list_->Notify(
&RemovableStorageObserver::OnRemovableStorageAttached, info);
« no previous file with comments | « chrome/browser/storage_monitor/storage_info.cc ('k') | chrome/browser/storage_monitor/storage_monitor_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698