Update To 11.40.268.0
[platform/framework/web/crosswalk.git] / src / remoting / host / win / host_service.h
index 855f37c..96cfff2 100644 (file)
@@ -38,9 +38,9 @@ class HostService : public WtsTerminalMonitor {
 
   // WtsTerminalMonitor implementation
   virtual bool AddWtsTerminalObserver(const std::string& terminal_id,
-                                      WtsTerminalObserver* observer) OVERRIDE;
+                                      WtsTerminalObserver* observer) override;
   virtual void RemoveWtsTerminalObserver(
-      WtsTerminalObserver* observer) OVERRIDE;
+      WtsTerminalObserver* observer) override;
 
  private:
   HostService();
@@ -116,9 +116,10 @@ class HostService : public WtsTerminalMonitor {
   // A waitable event that is used to wait until the service is stopped.
   base::WaitableEvent stopped_event_;
 
+  base::WeakPtr<HostService> weak_ptr_;
+
   // Used to post session change notifications and control events.
   base::WeakPtrFactory<HostService> weak_factory_;
-  base::WeakPtr<HostService> weak_ptr_;
 
   // Singleton.
   friend struct DefaultSingletonTraits<HostService>;