chrome/browser/ui/app_list/app_list_service_cocoa_mac.h - 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/ui/app_list/app_list_service_cocoa_mac.h

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/ui/app_list/app_list_prefs_factory.cc ('k') | chrome/browser/ui/app_list/app_list_service_cocoa_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/app_list/app_list_service_cocoa_mac.h

diff --git a/chrome/browser/ui/app_list/app_list_service_cocoa_mac.h b/chrome/browser/ui/app_list/app_list_service_cocoa_mac.h

index ba5f511c632a8c0d7c38960d9a938acb30a47382..9bc8df52842cca69892c329b27d6950d64ba0b62 100644

--- a/chrome/browser/ui/app_list/app_list_service_cocoa_mac.h

+++ b/chrome/browser/ui/app_list/app_list_service_cocoa_mac.h

@@ -14,8 +14,10 @@ class AppListServiceMacTestApi;

class AppListControllerDelegateImpl;

@class AppListWindowController;

+namespace base {

template <typename T>

struct DefaultSingletonTraits;

+} // namespace base

// AppListServiceCocoaMac shows and hides the Cocoa app list on Mac.

class AppListServiceCocoaMac : public AppListServiceMac {

@@ -40,7 +42,7 @@ class AppListServiceCocoaMac : public AppListServiceMac {

private:

friend class test::AppListServiceMacTestApi;

- friend struct DefaultSingletonTraits<AppListServiceCocoaMac>;

+ friend struct base::DefaultSingletonTraits<AppListServiceCocoaMac>;

AppListServiceCocoaMac();

« no previous file with comments | « chrome/browser/ui/app_list/app_list_prefs_factory.cc ('k') | chrome/browser/ui/app_list/app_list_service_cocoa_mac.mm » ('j') | no next file with comments »