Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / mojo / common / handle_watcher.cc

diff --git a/src/mojo/common/handle_watcher.cc b/src/mojo/common/handle_watcher.cc
index eeb3e04..7819779 100644 (file)
--- a/src/mojo/common/handle_watcher.cc
+++ b/src/mojo/common/handle_watcher.cc
@@ -61,7 +61,7 @@ struct WatchData {
 class WatcherBackend : public MessagePumpMojoHandler {
  public:
   WatcherBackend();
-  virtual ~WatcherBackend();
+  ~WatcherBackend() override;
 
   void StartWatching(const WatchData& data);
 
@@ -79,8 +79,8 @@ class WatcherBackend : public MessagePumpMojoHandler {
   bool GetMojoHandleByWatcherID(WatcherID watcher_id, Handle* handle) const;
 
   // MessagePumpMojoHandler overrides:
-  virtual void OnHandleReady(const Handle& handle) OVERRIDE;
-  virtual void OnHandleError(const Handle& handle, MojoResult result) OVERRIDE;
+  void OnHandleReady(const Handle& handle) override;
+  void OnHandleError(const Handle& handle, MojoResult result) override;
 
   // Maps from assigned id to WatchData.
   HandleToWatchDataMap handle_to_data_;
@@ -123,6 +123,7 @@ void WatcherBackend::RemoveAndNotify(const Handle& handle,
   const WatchData data(handle_to_data_[handle]);
   handle_to_data_.erase(handle);
   MessagePumpMojo::current()->RemoveHandler(handle);
+
   data.message_loop->PostTask(FROM_HERE, base::Bind(data.callback, result));
 }
 
@@ -325,7 +326,7 @@ class HandleWatcher::StateBase : public base::MessageLoop::DestructionObserver {
     base::MessageLoop::current()->AddDestructionObserver(this);
   }
 
-  virtual ~StateBase() {
+  ~StateBase() override {
     base::MessageLoop::current()->RemoveDestructionObserver(this);
   }
 
@@ -338,7 +339,7 @@ class HandleWatcher::StateBase : public base::MessageLoop::DestructionObserver {
   bool got_ready() const { return got_ready_; }
 
  private:
-  virtual void WillDestroyCurrentMessageLoop() OVERRIDE {
+  void WillDestroyCurrentMessageLoop() override {
     // The current thread is exiting. Simulate a watch error.
     NotifyAndDestroy(MOJO_RESULT_ABORTED);
   }
@@ -378,18 +379,18 @@ class HandleWatcher::SameThreadWatchingState : public StateBase,
         this, handle, handle_signals, MojoDeadlineToTimeTicks(deadline));
   }
 
-  virtual ~SameThreadWatchingState() {
+  ~SameThreadWatchingState() override {
     if (!got_ready())
       MessagePumpMojo::current()->RemoveHandler(handle_);
   }
 
  private:
   // MessagePumpMojoHandler overrides:
-  virtual void OnHandleReady(const Handle& handle) OVERRIDE {
+  void OnHandleReady(const Handle& handle) override {
     StopWatchingAndNotifyReady(handle, MOJO_RESULT_OK);
   }
 
-  virtual void OnHandleError(const Handle& handle, MojoResult result) OVERRIDE {
+  void OnHandleError(const Handle& handle, MojoResult result) override {
     StopWatchingAndNotifyReady(handle, result);
   }
 
@@ -424,7 +425,7 @@ class HandleWatcher::SecondaryThreadWatchingState : public StateBase {
                    weak_factory_.GetWeakPtr()));
   }
 
-  virtual ~SecondaryThreadWatchingState() {
+  ~SecondaryThreadWatchingState() override {
     // If we've been notified the handle is ready (|got_ready()| is true) then
     // the watch has been implicitly removed by
     // WatcherThreadManager/MessagePumpMojo and we don't have to call