Move Aura to UI subdir.

views/aura_desktop/aura_desktop_main.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 "aura/desktop.h"
-#include "aura/desktop_host.h"
-#include "aura/window.h"
-#include "aura/window_delegate.h"
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/i18n/icu_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "third_party/skia/include/core/SkXfermode.h"
+#include "ui/aura/desktop.h"
+#include "ui/aura/desktop_host.h"
+#include "ui/aura/window.h"
+#include "ui/aura/window_delegate.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_paths.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/canvas_skia.h"
 #include "ui/gfx/rect.h"
 #include "views/widget/widget.h"
 #include "views/widget/widget_delegate.h"
 
 #if !defined(OS_WIN)
-#include "aura/hit_test.h"
+#include "ui/aura/hit_test.h"
 #endif
 
 namespace {
 
 // Trivial WindowDelegate implementation that draws a colored background.
 class DemoWindowDelegate : public aura::WindowDelegate {
  public:
   explicit DemoWindowDelegate(SkColor color) : color_(color) {}
 
   // Overridden from aura::WindowDelegate:
@@ skipping 134 matching lines @@
       contents, window2, gfx::Rect(120, 150, 200, 200));
   views_window->Show();
 
   aura::Desktop::GetInstance()->Run();
 
   delete aura::Desktop::GetInstance();
 
   return 0;
 }