chrome/browser/chromeos/customization/customization_document.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: chrome/browser/chromeos/customization/customization_document.h

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

Patch Set: Add blank lines 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/memory/singleton.h ('K') | « chrome/browser/chromeos/camera_presence_notifier.cc ('k') | chrome/browser/chromeos/customization/customization_document.cc » ('j') | chromecast/media/base/media_message_loop.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/customization/customization_document.h

diff --git a/chrome/browser/chromeos/customization/customization_document.h b/chrome/browser/chromeos/customization/customization_document.h

index e1cb47188f0b1ca972e52a65bba290b25ec04130..24dfdacb3c336d1d9c73f213ee0ddd5d2f69dfb7 100644

--- a/chrome/browser/chromeos/customization/customization_document.h

+++ b/chrome/browser/chromeos/customization/customization_document.h

@@ -108,7 +108,7 @@ class StartupCustomizationDocument : public CustomizationDocument {

friend class OobeLocalizationTest;

friend void InitStartupCustomizationDocumentForTesting(

const std::string& manifest);

- friend struct DefaultSingletonTraits<StartupCustomizationDocument>;

+ friend struct base::DefaultSingletonTraits<StartupCustomizationDocument>;

// C-tor for singleton construction.

StartupCustomizationDocument();

@@ -198,7 +198,7 @@ class ServicesCustomizationDocument : public CustomizationDocument,

}

private:

- friend struct DefaultSingletonTraits<ServicesCustomizationDocument>;

+ friend struct base::DefaultSingletonTraits<ServicesCustomizationDocument>;

FRIEND_TEST_ALL_PREFIXES(CustomizationWallpaperDownloaderBrowserTest,

OEMWallpaperIsPresent);

FRIEND_TEST_ALL_PREFIXES(CustomizationWallpaperDownloaderBrowserTest,