Consolidate message observer API for win and aura (and touch).

chrome/browser/jankometer.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <limits>
 
 #include "chrome/browser/jankometer.h"
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
@@ skipping 286 matching lines @@
     base::TimeTicks now = base::TimeTicks::Now();
     const base::TimeDelta queueing_time = now - time_posted;
     helper_.StartProcessingTimers(queueing_time);
   }
 
   virtual void DidProcessTask(base::TimeTicks time_posted) OVERRIDE {
     helper_.EndProcessingTimers();
   }
 
 #if defined(OS_WIN)
-  virtual void WillProcessMessage(const MSG& msg) {
+  virtual base::EventStatus WillProcessEvent(
+      const base::NativeEvent& event) OVERRIDE {
     if (!helper_.MessageWillBeMeasured())
-      return;
+      return base::EVENT_CONTINUE;
     // GetMessageTime returns a LONG (signed 32-bit) and GetTickCount returns
     // a DWORD (unsigned 32-bit). They both wrap around when the time is longer
     // than they can hold. I'm not sure if GetMessageTime wraps around to 0,
     // or if the original time comes from GetTickCount, it might wrap around
     // to -1.
     //
     // Therefore, I cast to DWORD so if it wraps to -1 we will correct it. If
     // it doesn't, then our time delta will be negative if a message happens
     // to straddle the wraparound point, it will still be OK.
-    DWORD cur_message_issue_time = static_cast<DWORD>(msg.time);
+    DWORD cur_message_issue_time = static_cast<DWORD>(event.time);
     DWORD cur_time = GetTickCount();
     base::TimeDelta queueing_time =
         base::TimeDelta::FromMilliseconds(cur_time - cur_message_issue_time);
 
     helper_.StartProcessingTimers(queueing_time);
+    return base::EVENT_CONTINUE;
   }
 
-  virtual void DidProcessMessage(const MSG& msg) {
+  virtual void DidProcessEvent(const base::NativeEvent& event) OVERRIDE {
     helper_.EndProcessingTimers();
   }
+#elif defined(TOUCH_UI) || defined(USE_AURA)
+  virtual base::EventStatus WillProcessEvent(
+      const base::NativeEvent& event) OVERRIDE {
+    return base::EVENT_CONTINUE;
+  }
+
+  virtual void DidProcessEvent(const base::NativeEvent& event) OVERRIDE {
+  }
 #elif defined(TOOLKIT_USES_GTK)
   virtual void WillProcessEvent(GdkEvent* event) {
     if (!helper_.MessageWillBeMeasured())
       return;
     // TODO(evanm): we want to set queueing_time_ using
     // gdk_event_get_time, but how do you convert that info
     // into a delta?
     // guint event_time = gdk_event_get_time(event);
     base::TimeDelta queueing_time = base::TimeDelta::FromMilliseconds(0);
     helper_.StartProcessingTimers(queueing_time);
@@ skipping 68 matching lines @@
     delete ui_observer;
     ui_observer = NULL;
   }
   if (io_observer) {
     // IO thread can't be running when we remove observers.
     DCHECK((!g_browser_process) || !(g_browser_process->io_thread()));
     delete io_observer;
     io_observer = NULL;
   }
 }