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

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/password_manager/password_store_factory.cc ('k') | chrome/browser/performance_monitor/performance_monitor.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/performance_monitor/performance_monitor.h

diff --git a/chrome/browser/performance_monitor/performance_monitor.h b/chrome/browser/performance_monitor/performance_monitor.h

index 22bdb584ac695ba5be7d8fccd9b590ba56e4a063..7e1b20f659adcb50b73a3b1acf49dcd0f36ea8eb 100644

--- a/chrome/browser/performance_monitor/performance_monitor.h

+++ b/chrome/browser/performance_monitor/performance_monitor.h

@@ -12,8 +12,10 @@

#include "base/timer/timer.h"

#include "chrome/browser/performance_monitor/process_metrics_history.h"

+namespace base {

template <typename Type>

struct DefaultSingletonTraits;

+} // namespace base

namespace content {

struct ChildProcessData;

@@ -36,7 +38,7 @@ class PerformanceMonitor {

private:

typedef std::map<base::ProcessHandle, ProcessMetricsHistory> MetricsMap;

- friend struct DefaultSingletonTraits<PerformanceMonitor>;

+ friend struct base::DefaultSingletonTraits<PerformanceMonitor>;

PerformanceMonitor();

virtual ~PerformanceMonitor();