ios/chrome/browser/enhanced_bookmarks/enhanced_bookmark_model_factory.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: ios/chrome/browser/enhanced_bookmarks/enhanced_bookmark_model_factory.h

Issue 1308823002: Move Singleton and related structs to namespace base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix more errors Created 5 years, 4 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

« base/trace_event/trace_log.cc ('K') | « ios/chrome/browser/enhanced_bookmarks/bookmark_server_cluster_service_factory.cc ('k') | ios/chrome/browser/enhanced_bookmarks/enhanced_bookmark_model_factory.cc » ('j') | ios/chrome/browser/favicon/favicon_service_factory.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ios/chrome/browser/enhanced_bookmarks/enhanced_bookmark_model_factory.h

diff --git a/ios/chrome/browser/enhanced_bookmarks/enhanced_bookmark_model_factory.h b/ios/chrome/browser/enhanced_bookmarks/enhanced_bookmark_model_factory.h

index 9f40a9491b680c02f2aa6e9f4c2b695e1adbd02c..850ba0d0ebeb2182ef2bd613db4f807f6403a0c9 100644

--- a/ios/chrome/browser/enhanced_bookmarks/enhanced_bookmark_model_factory.h

+++ b/ios/chrome/browser/enhanced_bookmarks/enhanced_bookmark_model_factory.h

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

#include "components/keyed_service/ios/browser_state_keyed_service_factory.h"

template <typename T>

-struct DefaultSingletonTraits;

+struct base::DefaultSingletonTraits;

namespace ios {

class ChromeBrowserState;

@@ -29,7 +29,7 @@ class EnhancedBookmarkModelFactory : public BrowserStateKeyedServiceFactory {

ios::ChromeBrowserState* browser_state);

private:

- friend struct DefaultSingletonTraits<EnhancedBookmarkModelFactory>;

+ friend struct base::DefaultSingletonTraits<EnhancedBookmarkModelFactory>;

EnhancedBookmarkModelFactory();

~EnhancedBookmarkModelFactory() override;