chrome/browser/chromeos/cros_settings.cc - 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/cros_settings.cc

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

« no previous file with comments | « chrome/browser/chromeos/cros_settings.h ('k') | chrome/browser/chromeos/gview_request_interceptor.h » ('j') | chrome/browser/chromeos/gview_request_interceptor.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/cros_settings.cc

diff --git a/chrome/browser/chromeos/cros_settings.cc b/chrome/browser/chromeos/cros_settings.cc

index 0c86226afc87caeb00f572e1fc501c1883675e4f..d5cbe6b7191499f855b1090e8a60b0688f58a5ee 100644

--- a/chrome/browser/chromeos/cros_settings.cc

+++ b/chrome/browser/chromeos/cros_settings.cc

@@ -4,7 +4,7 @@

#include "chrome/browser/chromeos/cros_settings.h"

-#include "base/singleton.h"

+#include "base/lazy_instance.h"

#include "base/string_util.h"

#include "base/values.h"

#include "chrome/browser/chromeos/cros_settings_provider.h"

@@ -13,9 +13,12 @@

namespace chromeos {

+static base::LazyInstance<CrosSettings> g_cros_settings(

+ base::LINKER_INITIALIZED);

CrosSettings* CrosSettings::Get() {

// TODO(xiyaun): Use real stuff when underlying libcros is ready.

- return Singleton<CrosSettings>::get();

+ return g_cros_settings.Pointer();

}

bool CrosSettings::IsCrosSettings(const std::string& path) {