chrome/browser/ui/webui/chromeos/mobile_setup_dialog.cc - 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/webui/chromeos/mobile_setup_dialog.cc

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/webui/chromeos/login/l10n_util_unittest.cc ('k') | chrome/browser/ui/webui/ntp/app_resource_cache_factory.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/chromeos/mobile_setup_dialog.cc

diff --git a/chrome/browser/ui/webui/chromeos/mobile_setup_dialog.cc b/chrome/browser/ui/webui/chromeos/mobile_setup_dialog.cc

index 8aa86f31f3360ef9c9c24550503fd68789152c1c..b3eb49c19a90da75e5931d5c8a388121c3b78068 100644

--- a/chrome/browser/ui/webui/chromeos/mobile_setup_dialog.cc

+++ b/chrome/browser/ui/webui/chromeos/mobile_setup_dialog.cc

@@ -35,7 +35,7 @@ class MobileSetupDialogDelegate : public WebDialogDelegate {

void ShowDialog(const std::string& service_path);

protected:

- friend struct DefaultSingletonTraits<MobileSetupDialogDelegate>;

+ friend struct base::DefaultSingletonTraits<MobileSetupDialogDelegate>;

MobileSetupDialogDelegate();

~MobileSetupDialogDelegate() override;

@@ -71,7 +71,7 @@ void MobileSetupDialog::Show(const std::string& service_path) {

// static

MobileSetupDialogDelegate* MobileSetupDialogDelegate::GetInstance() {

DCHECK_CURRENTLY_ON(BrowserThread::UI);

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

+ return base::Singleton<MobileSetupDialogDelegate>::get();

}

MobileSetupDialogDelegate::MobileSetupDialogDelegate() : dialog_window_(NULL) {