chrome/browser/chromeos/upgrade_detector_chromeos.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/upgrade_detector_chromeos.h

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

Patch Set: Fix more errors 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/trace_event/trace_log.cc ('K') | « chrome/browser/chromeos/ui/accessibility_focus_ring_controller.cc ('k') | chrome/browser/chromeos/upgrade_detector_chromeos.cc » ('j') | ios/chrome/browser/favicon/favicon_service_factory.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/upgrade_detector_chromeos.h

diff --git a/chrome/browser/chromeos/upgrade_detector_chromeos.h b/chrome/browser/chromeos/upgrade_detector_chromeos.h

index 0bca5eafd90ecc3ebfe4699f6f881797421db8fa..b062f569be705ef060e082ccd532dc2f756ea8e0 100644

--- a/chrome/browser/chromeos/upgrade_detector_chromeos.h

+++ b/chrome/browser/chromeos/upgrade_detector_chromeos.h

@@ -11,7 +11,10 @@

#include "chrome/browser/upgrade_detector.h"

#include "chromeos/dbus/update_engine_client.h"

-template <typename T> struct DefaultSingletonTraits;

+namespace base {

+template <typename T>

+struct base::DefaultSingletonTraits;

+} // namespace base

class UpgradeDetectorChromeos : public UpgradeDetector,

public chromeos::UpdateEngineClient::Observer {

@@ -29,7 +32,7 @@ class UpgradeDetectorChromeos : public UpgradeDetector,

void Shutdown();

private:

- friend struct DefaultSingletonTraits<UpgradeDetectorChromeos>;

+ friend struct base::DefaultSingletonTraits<UpgradeDetectorChromeos>;

class ChannelsRequester;

UpgradeDetectorChromeos();