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

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

Issue 1194373002: Moved ScopedPtrMap into base namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@jianli-gcm_client_impl
Patch Set: Rebase and update against media_galleries. Created 5 years, 6 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.h
diff --git a/chrome/browser/media_galleries/gallery_watch_manager.h b/chrome/browser/media_galleries/gallery_watch_manager.h
index f4803c8a9db03402ddc7263a1297663836c504b3..a87a2e2ae8afd8025bc2ca067f119e93c901efb7 100644
--- a/chrome/browser/media_galleries/gallery_watch_manager.h
+++ b/chrome/browser/media_galleries/gallery_watch_manager.h
@@ -109,8 +109,9 @@ class GalleryWatchManager
typedef std::map<base::FilePath, NotificationInfo> WatchedPaths;
typedef std::map<content::BrowserContext*, GalleryWatchManagerObserver*>
ObserverMap;
- typedef ScopedPtrMap<content::BrowserContext*,
- scoped_ptr<KeyedServiceShutdownNotifier::Subscription>>
+ typedef base::ScopedPtrMap<
+ content::BrowserContext*,
+ scoped_ptr<KeyedServiceShutdownNotifier::Subscription>>
BrowserContextSubscriptionMap;
// Ensure there is a subscription to shutdown notifications for
« no previous file with comments | « base/containers/scoped_ptr_map_unittest.cc ('k') | chrome/browser/media_galleries/media_file_system_registry.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698