summaryrefslogtreecommitdiffstats
path: root/views/aura_desktop
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-14 21:14:01 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-14 21:14:01 +0000
commitf94f0f14dd3c9c49c6da8bdf3d7de19f4a6fb6b7 (patch)
tree17f77aa9323a3e1de24b6603e385301eab13d8c3 /views/aura_desktop
parente49d616f0151b407d6b9296167facdc0655811c5 (diff)
downloadchromium_src-f94f0f14dd3c9c49c6da8bdf3d7de19f4a6fb6b7.zip
chromium_src-f94f0f14dd3c9c49c6da8bdf3d7de19f4a6fb6b7.tar.gz
chromium_src-f94f0f14dd3c9c49c6da8bdf3d7de19f4a6fb6b7.tar.bz2
Move Aura to UI subdir.
BUG=none TEST=none TBR=sky Review URL: http://codereview.chromium.org/7886042 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101156 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/aura_desktop')
-rw-r--r--views/aura_desktop/aura_desktop_main.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/views/aura_desktop/aura_desktop_main.cc b/views/aura_desktop/aura_desktop_main.cc
index b5887d5..2036208 100644
--- a/views/aura_desktop/aura_desktop_main.cc
+++ b/views/aura_desktop/aura_desktop_main.cc
@@ -2,16 +2,16 @@
// 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"
@@ -21,7 +21,7 @@
#include "views/widget/widget_delegate.h"
#if !defined(OS_WIN)
-#include "aura/hit_test.h"
+#include "ui/aura/hit_test.h"
#endif
namespace {