Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(263)

Unified Diff: remoting/client/jni/chromoting_jni_runtime.h

Issue 1308823002: Move Singleton and related structs to namespace base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: git cl format 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
Index: remoting/client/jni/chromoting_jni_runtime.h
diff --git a/remoting/client/jni/chromoting_jni_runtime.h b/remoting/client/jni/chromoting_jni_runtime.h
index 1ca11243e977f79b403ae84cbf8c4201bfcb8a64..a57ecff16dc735fa229428cf657b79c94cce8fed 100644
--- a/remoting/client/jni/chromoting_jni_runtime.h
+++ b/remoting/client/jni/chromoting_jni_runtime.h
@@ -14,7 +14,9 @@
#include "remoting/client/jni/chromoting_jni_instance.h"
#include "remoting/protocol/connection_to_host.h"
+namespace base {
template<typename T> struct DefaultSingletonTraits;
+}
namespace remoting {
@@ -135,7 +137,7 @@ class ChromotingJniRuntime {
// Contains all connection-specific state.
scoped_refptr<ChromotingJniInstance> session_;
- friend struct DefaultSingletonTraits<ChromotingJniRuntime>;
+ friend struct base::DefaultSingletonTraits<ChromotingJniRuntime>;
DISALLOW_COPY_AND_ASSIGN(ChromotingJniRuntime);
};

Powered by Google App Engine
This is Rietveld 408576698