chrome/browser/chromeos/login/ownership_service.h - Issue 5734002: Continuation of CL 5685007, rename the singleton accessor method in more files.

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/chromeos/login/ownership_service.h

Issue 5734002: Continuation of CL 5685007, rename the singleton accessor method in more files. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: . Created 10 years 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

« chrome/browser/chromeos/gview_request_interceptor.h ('K') | « chrome/browser/chromeos/login/existing_user_controller.cc ('k') | chrome/browser/chromeos/login/ownership_service.cc » ('j') | chrome/browser/chromeos/usb_mount_observer_browsertest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/ownership_service.h

diff --git a/chrome/browser/chromeos/login/ownership_service.h b/chrome/browser/chromeos/login/ownership_service.h

index 4f8227dcc3dd6e5a1aae3bd2e3d0f44ecbc6018b..bc407d995d7d22a94c350371198a5bef3f3f5b45 100644

--- a/chrome/browser/chromeos/login/ownership_service.h

+++ b/chrome/browser/chromeos/login/ownership_service.h

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

#include <string>

#include <vector>

-#include "base/singleton.h"

#include "chrome/browser/chromeos/login/owner_key_utils.h"

#include "chrome/browser/chromeos/login/owner_manager.h"

+namespace base {

+template <typename T> struct DefaultLazyInstanceTraits;

namespace chromeos {

class OwnershipService {

@@ -69,7 +72,7 @@ class OwnershipService {

OwnershipService();

private:

- friend struct DefaultSingletonTraits<OwnershipService>;

+ friend struct base::DefaultLazyInstanceTraits<OwnershipService>;

friend class OwnershipServiceTest;

scoped_refptr<OwnerManager> manager_;