Index: chrome/browser/apps/app_shim/app_shim_handler_mac.cc |
diff --git a/chrome/browser/apps/app_shim/app_shim_handler_mac.cc b/chrome/browser/apps/app_shim/app_shim_handler_mac.cc |
index c7801ad76dd50cf4ac4f3adebcbc5bcf7a1e3029..8b55be16f88ac96bc28e988c7b0846f94c9763fc 100644 |
--- a/chrome/browser/apps/app_shim/app_shim_handler_mac.cc |
+++ b/chrome/browser/apps/app_shim/app_shim_handler_mac.cc |
@@ -35,8 +35,9 @@ void TerminateIfNoAppWindows() { |
class AppShimHandlerRegistry : public content::NotificationObserver { |
public: |
static AppShimHandlerRegistry* GetInstance() { |
- return Singleton<AppShimHandlerRegistry, |
- LeakySingletonTraits<AppShimHandlerRegistry> >::get(); |
+ return base::Singleton< |
+ AppShimHandlerRegistry, |
+ base::LeakySingletonTraits<AppShimHandlerRegistry>>::get(); |
} |
AppShimHandler* GetForAppMode(const std::string& app_mode_id) const { |
@@ -74,7 +75,7 @@ class AppShimHandlerRegistry : public content::NotificationObserver { |
} |
private: |
- friend struct DefaultSingletonTraits<AppShimHandlerRegistry>; |
+ friend struct base::DefaultSingletonTraits<AppShimHandlerRegistry>; |
typedef std::map<std::string, AppShimHandler*> HandlerMap; |
AppShimHandlerRegistry() |