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

Unified Diff: ppapi/proxy/ppb_image_data_proxy.cc

Issue 1308823002: Move Singleton and related structs to namespace base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: ToT Created 5 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
« no previous file with comments | « ppapi/proxy/plugin_var_tracker.h ('k') | ppapi/proxy/proxy_module.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ppapi/proxy/ppb_image_data_proxy.cc
diff --git a/ppapi/proxy/ppb_image_data_proxy.cc b/ppapi/proxy/ppb_image_data_proxy.cc
index 02fdad6f7ef9b25b512042b40eab7d4d9121f445..ed15bb6a1172afa4bd1c51bbc50593e6469b074c 100644
--- a/ppapi/proxy/ppb_image_data_proxy.cc
+++ b/ppapi/proxy/ppb_image_data_proxy.cc
@@ -244,7 +244,7 @@ class ImageDataCache {
void DidDeleteInstance(PP_Instance instance);
private:
- friend struct LeakySingletonTraits<ImageDataCache>;
+ friend struct base::LeakySingletonTraits<ImageDataCache>;
// Timer callback to expire entries for the given instance.
void OnTimer(PP_Instance instance);
@@ -263,8 +263,8 @@ class ImageDataCache {
// static
ImageDataCache* ImageDataCache::GetInstance() {
- return Singleton<ImageDataCache,
- LeakySingletonTraits<ImageDataCache> >::get();
+ return base::Singleton<ImageDataCache,
+ base::LeakySingletonTraits<ImageDataCache>>::get();
}
scoped_refptr<ImageData> ImageDataCache::Get(
« no previous file with comments | « ppapi/proxy/plugin_var_tracker.h ('k') | ppapi/proxy/proxy_module.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698