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

Index: chrome/browser/ui/cocoa/accelerators_cocoa.h

diff --git a/chrome/browser/ui/cocoa/accelerators_cocoa.h b/chrome/browser/ui/cocoa/accelerators_cocoa.h

index e29eefb9de9a6b6a72f2aeebca37f0872d5deabb..5c8961976e1c05471dd2acbf01c663b10f059fdd 100644

--- a/chrome/browser/ui/cocoa/accelerators_cocoa.h

+++ b/chrome/browser/ui/cocoa/accelerators_cocoa.h

@@ -13,7 +13,10 @@

#include "base/gtest_prod_util.h"

#include "ui/base/accelerators/accelerator.h"

-template <typename T> struct DefaultSingletonTraits;

+namespace base {

+template <typename T>

+struct DefaultSingletonTraits;

+} // namespace base

// This class maintains a map of command_ids to Accelerator objects (see

// chrome/app/chrome_command_ids.h). Currently, this only lists the commands

@@ -47,7 +50,7 @@ class AcceleratorsCocoa {

static AcceleratorsCocoa* GetInstance();

private:

- friend struct DefaultSingletonTraits<AcceleratorsCocoa>;

+ friend struct base::DefaultSingletonTraits<AcceleratorsCocoa>;

FRIEND_TEST_ALL_PREFIXES(AcceleratorsCocoaBrowserTest,

MappingAcceleratorsInMainMenu);