chrome/browser/apps/app_shim/app_shim_handler_mac.cc - Issue 1308823002: Move Singleton and related structs to namespace base

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/apps/app_shim/app_shim_handler_mac.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 | « chrome/browser/android/omnibox/autocomplete_controller_android.cc ('k') | chrome/browser/apps/ephemeral_app_service_factory.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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()