content/browser/device_sensors/sensor_manager_android.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: content/browser/device_sensors/sensor_manager_android.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') | « content/browser/device_sensors/device_inertial_sensor_service.cc ('k') | content/browser/device_sensors/sensor_manager_android.cc » ('j') | ios/chrome/browser/favicon/favicon_service_factory.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/device_sensors/sensor_manager_android.h

diff --git a/content/browser/device_sensors/sensor_manager_android.h b/content/browser/device_sensors/sensor_manager_android.h

index 535efa1c1c92a6970cebbb26f7877347933bbb17..89117882a09acaf66601056b5ac6c9f16239aeaa 100644

--- a/content/browser/device_sensors/sensor_manager_android.h

+++ b/content/browser/device_sensors/sensor_manager_android.h

@@ -13,7 +13,10 @@

#include "content/common/device_sensors/device_motion_hardware_buffer.h"

#include "content/common/device_sensors/device_orientation_hardware_buffer.h"

-template<typename T> struct DefaultSingletonTraits;

+namespace base {

+template <typename T>

+struct DefaultSingletonTraits;

namespace content {

@@ -82,7 +85,7 @@ class CONTENT_EXPORT SensorManagerAndroid {

void StopFetchingOrientationDataOnUI();

private:

- friend struct DefaultSingletonTraits<SensorManagerAndroid>;

+ friend struct base::DefaultSingletonTraits<SensorManagerAndroid>;

enum {

RECEIVED_MOTION_DATA_ACCELERATION = 0,