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

Unified Diff: chrome/browser/media_galleries/gallery_watch_manager.cc

Issue 2230203002: chrome: Use stl utilities from the base namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed accidental components/ change Created 4 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/media_galleries/gallery_watch_manager.cc
diff --git a/chrome/browser/media_galleries/gallery_watch_manager.cc b/chrome/browser/media_galleries/gallery_watch_manager.cc
index b396cf94dfeda112ffcf59ead616350ed6f561c8..c3147b596e2d49628b109db2ce793cc6f0b7331e 100644
--- a/chrome/browser/media_galleries/gallery_watch_manager.cc
+++ b/chrome/browser/media_galleries/gallery_watch_manager.cc
@@ -109,7 +109,7 @@ void GalleryWatchManager::FileWatchManager::AddFileWatch(
// This can occur if the GalleryWatchManager attempts to watch the same path
// again before recieving the callback. It's benign.
- if (ContainsKey(watchers_, path)) {
+ if (base::ContainsKey(watchers_, path)) {
BrowserThread::PostTask(
BrowserThread::UI, FROM_HERE, base::Bind(callback, false));
return;
@@ -196,7 +196,7 @@ void GalleryWatchManager::AddObserver(BrowserContext* browser_context,
GalleryWatchManagerObserver* observer) {
DCHECK(browser_context);
DCHECK(observer);
- DCHECK(!ContainsKey(observers_, browser_context));
+ DCHECK(!base::ContainsKey(observers_, browser_context));
observers_[browser_context] = observer;
}
@@ -241,7 +241,7 @@ void GalleryWatchManager::AddWatch(BrowserContext* browser_context,
DCHECK(extension);
WatchOwner owner(browser_context, extension->id(), gallery_id);
- if (ContainsKey(watches_, owner)) {
+ if (base::ContainsKey(watches_, owner)) {
callback.Run(std::string());
return;
}
@@ -250,14 +250,14 @@ void GalleryWatchManager::AddWatch(BrowserContext* browser_context,
g_browser_process->media_file_system_registry()->GetPreferences(
Profile::FromBrowserContext(browser_context));
- if (!ContainsKey(preferences->known_galleries(), gallery_id)) {
+ if (!base::ContainsKey(preferences->known_galleries(), gallery_id)) {
callback.Run(kInvalidGalleryIDError);
return;
}
MediaGalleryPrefIdSet permitted =
preferences->GalleriesForExtension(*extension);
- if (!ContainsKey(permitted, gallery_id)) {
+ if (!base::ContainsKey(permitted, gallery_id)) {
callback.Run(kNoPermissionError);
return;
}
@@ -271,7 +271,7 @@ void GalleryWatchManager::AddWatch(BrowserContext* browser_context,
}
// Observe the preferences if we haven't already.
- if (!ContainsKey(observed_preferences_, preferences)) {
+ if (!base::ContainsKey(observed_preferences_, preferences)) {
observed_preferences_.insert(preferences);
preferences->AddGalleryChangeObserver(this);
}
@@ -280,7 +280,7 @@ void GalleryWatchManager::AddWatch(BrowserContext* browser_context,
EnsureBrowserContextSubscription(owner.browser_context);
// Start the FilePathWatcher on |gallery_path| if necessary.
- if (ContainsKey(watched_paths_, path)) {
+ if (base::ContainsKey(watched_paths_, path)) {
OnFileWatchActivated(owner, path, callback, true);
} else {
base::Callback<void(bool)> on_watch_added =
@@ -405,7 +405,7 @@ void GalleryWatchManager::OnFilePathChanged(const base::FilePath& path,
++it) {
Profile* profile = Profile::FromBrowserContext(it->browser_context);
RemoveWatch(it->browser_context, it->extension_id, it->gallery_id);
- if (ContainsKey(observers_, profile))
+ if (base::ContainsKey(observers_, profile))
observers_[profile]->OnGalleryWatchDropped(it->extension_id,
it->gallery_id);
}
@@ -441,8 +441,8 @@ void GalleryWatchManager::OnFilePathChanged(const base::FilePath& path,
for (it = notification_info->second.owners.begin();
it != notification_info->second.owners.end();
++it) {
- DCHECK(ContainsKey(watches_, *it));
- if (ContainsKey(observers_, it->browser_context)) {
+ DCHECK(base::ContainsKey(watches_, *it));
+ if (base::ContainsKey(observers_, it->browser_context)) {
observers_[it->browser_context]->OnGalleryChanged(it->extension_id,
it->gallery_id);
}
@@ -453,7 +453,7 @@ void GalleryWatchManager::OnPermissionRemoved(MediaGalleriesPreferences* pref,
const std::string& extension_id,
MediaGalleryPrefId pref_id) {
RemoveWatch(pref->profile(), extension_id, pref_id);
- if (ContainsKey(observers_, pref->profile()))
+ if (base::ContainsKey(observers_, pref->profile()))
observers_[pref->profile()]->OnGalleryWatchDropped(extension_id, pref_id);
}
@@ -473,7 +473,7 @@ void GalleryWatchManager::OnGalleryRemoved(MediaGalleriesPreferences* pref,
it != extension_ids.end();
++it) {
RemoveWatch(pref->profile(), *it, pref_id);
- if (ContainsKey(observers_, pref->profile()))
+ if (base::ContainsKey(observers_, pref->profile()))
observers_[pref->profile()]->OnGalleryWatchDropped(*it, pref_id);
}
}
@@ -488,7 +488,7 @@ void GalleryWatchManager::OnRemovableStorageDetached(
MediaGalleryPrefIdSet detached_ids =
preferences->LookUpGalleriesByDeviceId(info.device_id());
- if (ContainsKey(detached_ids, it->first.gallery_id)) {
+ if (base::ContainsKey(detached_ids, it->first.gallery_id)) {
WatchOwner owner = it->first;
DeactivateFileWatch(owner, it->second);
// Post increment moves iterator to next element while deleting current.

Powered by Google App Engine
This is Rietveld 408576698