Consolidate ui::NativeEvent and base::NativeEvent

ui/aura/desktop.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 "ui/aura/desktop.h"
 
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "ui/aura/desktop_host.h"
 #include "ui/aura/focus_manager.h"
@@ skipping 115 matching lines @@
 void Desktop::WindowDestroying(Window* window) {
   if (in_destructor_ || window != active_window_)
     return;
 
   // Reset active_window_ before invoking SetActiveWindow so that we don't
   // attempt to notify it while running its destructor.
   active_window_ = NULL;
   SetActiveWindow(GetTopmostWindowToActivate(window), NULL);
 }
 
-bool Desktop::DispatchNativeEvent(const ui::NativeEvent& event) {
+bool Desktop::DispatchNativeEvent(const base::NativeEvent& event) {
   // TODO(oshima): consolidate windows and linux.
 #if defined(OS_WIN)
   return host_->Dispatch(event);
 #else
   return host_->Dispatch(event) != base::MessagePumpDispatcher::EVENT_IGNORED;
 #endif
 }
 
 Window* Desktop::GetTopmostWindowToActivate(Window* ignore) {
   Window::Windows windows(default_parent_->children());
   for (Window::Windows::const_reverse_iterator i = windows.rbegin();
        i != windows.rend(); ++i) {
     if (*i != ignore && (*i)->IsVisible() &&
         (*i)->delegate()->ShouldActivate(NULL))
       return *i;
   }
   return NULL;
 }
 
 // static
 Desktop* Desktop::GetInstance() {
   if (!instance_) {
     instance_ = new Desktop;
     instance_->Init();
   }
   return instance_;
 }
 
 }  // namespace aura