Move the desktop aura classes into a desktop subdir to make the gyp simpler.

ui/views/widget/desktop_aura/x11_desktop_handler.cc

 // Copyright (c) 2012 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/views/widget/x11_desktop_handler.h"
+#include "ui/views/widget/desktop_aura/x11_desktop_handler.h"
 
 #include "base/message_loop.h"
 #include "ui/aura/env.h"
 #include "ui/aura/focus_manager.h"
 #include "ui/aura/root_window.h"
 #include "ui/base/x/x11_util.h"
 #include "ui/views/widget/desktop_aura/desktop_activation_client.h"
 
 #if !defined(OS_CHROMEOS)
 #include "ui/views/ime/input_method.h"
-#include "ui/views/widget/desktop_root_window_host_linux.h"
+#include "ui/views/widget/desktop_aura/desktop_root_window_host_linux.h"
 #endif
 
 namespace {
 
 const char* kAtomsToCache[] = {
   "_NET_ACTIVE_WINDOW",
   NULL
 };
 
 // Our global instance. Deleted when our Env() is deleted.
@@ skipping 90 matching lines @@
 
   DesktopRootWindowHostLinux* new_host =
       views::DesktopRootWindowHostLinux::GetHostForXID(xid);
   if (new_host)
     new_host->HandleNativeWidgetActivationChanged(true);
 
   current_window_ = xid;
 }
 
 }  // namespace views