ios/chrome/browser/bookmarks/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/bookmarks/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: git cl format 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

« components/keyed_service/content/browser_context_dependency_manager.h ('K') | « ios/chrome/browser/bookmarks/bookmark_client_factory.cc ('k') | ios/chrome/browser/bookmarks/bookmark_model_factory.cc » ('j') | ios/chrome/browser/history/web_history_service_factory.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ios/chrome/browser/bookmarks/bookmark_model_factory.h

diff --git a/ios/chrome/browser/bookmarks/bookmark_model_factory.h b/ios/chrome/browser/bookmarks/bookmark_model_factory.h

index 2a41784cf8c06140cbdc7a564b1a6e401d321b80..48206875f39b963d28acdbb4c94fff1e8148c457 100644

--- a/ios/chrome/browser/bookmarks/bookmark_model_factory.h

+++ b/ios/chrome/browser/bookmarks/bookmark_model_factory.h

@@ -9,9 +9,10 @@

#include "base/memory/scoped_ptr.h"

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

+namespace base {

template <typename T>

struct DefaultSingletonTraits;

+} // namespace base

namespace bookmarks {

sdefresne 2015/08/27 15:25:11 nit: can you live a blank line?

class BookmarkModel;

}

@@ -31,7 +32,7 @@ class BookmarkModelFactory : public BrowserStateKeyedServiceFactory {

static BookmarkModelFactory* GetInstance();

private:

- friend struct DefaultSingletonTraits<BookmarkModelFactory>;

+ friend struct base::DefaultSingletonTraits<BookmarkModelFactory>;

BookmarkModelFactory();

~BookmarkModelFactory() override;