70 files changed, 226 insertions, 227 deletions

diff --git a/ui/aura_shell/app_list/app_list.cc b/ash/app_list/app_list.cc
index b68acb9..4c8de88 100644
--- a/ui/aura_shell/app_list/app_list.cc
+++ b/ash/app_list/app_list.cc
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/aura_shell/app_list/app_list.h"
+#include "ash/app_list/app_list.h"
 
+#include "ash/app_list/app_list_model.h"
+#include "ash/app_list/app_list_view.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "ui/aura/event.h"
 #include "ui/aura/window.h"
-#include "ui/aura_shell/app_list/app_list_model.h"
-#include "ui/aura_shell/app_list/app_list_view.h"
 #include "ui/aura_shell/aura_shell_switches.h"
 #include "ui/aura_shell/shell_delegate.h"
 #include "ui/aura_shell/shell.h"
diff --git a/ui/aura_shell/app_list/app_list.h b/ash/app_list/app_list.h
index 0802258..114a3fb 100644
--- a/ui/aura_shell/app_list/app_list.h
+++ b/ash/app_list/app_list.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_AURA_SHELL_APP_LIST_APP_LIST_H_
-#define UI_AURA_SHELL_APP_LIST_APP_LIST_H_
+#ifndef ASH_APP_LIST_APP_LIST_H_
+#define ASH_APP_LIST_APP_LIST_H_
 #pragma once
 
 #include "base/basictypes.h"
@@ -80,4 +80,4 @@ class AppList : public aura::EventFilter,
 }  // namespace internal
 }  // namespace aura_shell
 
-#endif  //  UI_AURA_SHELL_APP_LIST_APP_LIST_H_
+#endif  //  ASH_APP_LIST_APP_LIST_H_
diff --git a/ui/aura_shell/app_list/app_list_groups_view.cc b/ash/app_list/app_list_groups_view.cc
index e448784..bd56859 100644
--- a/ui/aura_shell/app_list/app_list_groups_view.cc
+++ b/ash/app_list/app_list_groups_view.cc
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/aura_shell/app_list/app_list_groups_view.h"
+#include "ash/app_list/app_list_groups_view.h"
 
+#include "ash/app_list/app_list_item_group_model.h"
+#include "ash/app_list/app_list_item_group_view.h"
+#include "ash/app_list/app_list_item_view.h"
+#include "ash/app_list/app_list_model.h"
 #include "base/utf_string_conversions.h"
 #include "third_party/skia/include/core/SkColor.h"
-#include "ui/aura_shell/app_list/app_list_item_group_model.h"
-#include "ui/aura_shell/app_list/app_list_item_group_view.h"
-#include "ui/aura_shell/app_list/app_list_item_view.h"
-#include "ui/aura_shell/app_list/app_list_model.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/views/animation/bounds_animator.h"
 #include "ui/views/controls/button/text_button.h"
diff --git a/ui/aura_shell/app_list/app_list_groups_view.h b/ash/app_list/app_list_groups_view.h
index bc2839d..4cca797 100644
--- a/ui/aura_shell/app_list/app_list_groups_view.h
+++ b/ash/app_list/app_list_groups_view.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_AURA_SHELL_APP_LIST_APP_LIST_GROUPS_VIEW_H_
-#define UI_AURA_SHELL_APP_LIST_APP_LIST_GROUPS_VIEW_H_
+#ifndef ASH_APP_LIST_APP_LIST_GROUPS_VIEW_H_
+#define ASH_APP_LIST_APP_LIST_GROUPS_VIEW_H_
 #pragma once
 
 #include <string>
@@ -81,4 +81,4 @@ class AURA_SHELL_EXPORT AppListGroupsView : public views::View,
 
 }  // namespace aura_shell
 
-#endif  // UI_AURA_SHELL_APP_LIST_APP_LIST_GROUPS_VIEW_H_
+#endif  // ASH_APP_LIST_APP_LIST_GROUPS_VIEW_H_
diff --git a/ui/aura_shell/app_list/app_list_item_group_model.cc b/ash/app_list/app_list_item_group_model.cc
index 61e3b9e..0bf3974 100644
--- a/ui/aura_shell/app_list/app_list_item_group_model.cc
+++ b/ash/app_list/app_list_item_group_model.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/aura_shell/app_list/app_list_item_group_model.h"
+#include "ash/app_list/app_list_item_group_model.h"
 
 namespace aura_shell {
 
diff --git a/ui/aura_shell/app_list/app_list_item_group_model.h b/ash/app_list/app_list_item_group_model.h
index 6476742..985016c 100644
--- a/ui/aura_shell/app_list/app_list_item_group_model.h
+++ b/ash/app_list/app_list_item_group_model.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_AURA_SHELL_APP_LIST_APP_LIST_ITEM_GROUP_MODEL_H_
-#define UI_AURA_SHELL_APP_LIST_APP_LIST_ITEM_GROUP_MODEL_H_
+#ifndef ASH_APP_LIST_APP_LIST_ITEM_GROUP_MODEL_H_
+#define ASH_APP_LIST_APP_LIST_ITEM_GROUP_MODEL_H_
 #pragma once
 
 #include <string>
 
+#include "ash/app_list/app_list_item_model.h"
 #include "base/basictypes.h"
-#include "ui/aura_shell/app_list/app_list_item_model.h"
 #include "ui/aura_shell/aura_shell_export.h"
 #include "ui/base/models/list_model.h"
 
@@ -43,4 +43,4 @@ class AURA_SHELL_EXPORT AppListItemGroupModel {
 
 }  // namespace aura_shell
 
-#endif  // UI_AURA_SHELL_APP_LIST_APP_LIST_ITEM_GROUP_MODEL_H_
+#endif  // ASH_APP_LIST_APP_LIST_ITEM_GROUP_MODEL_H_
diff --git a/ui/aura_shell/app_list/app_list_item_group_view.cc b/ash/app_list/app_list_item_group_view.cc
index 3a91672..a316c08 100644
--- a/ui/aura_shell/app_list/app_list_item_group_view.cc
+++ b/ash/app_list/app_list_item_group_view.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/aura_shell/app_list/app_list_item_group_view.h"
+#include "ash/app_list/app_list_item_group_view.h"
 
-#include "ui/aura_shell/app_list/app_list_item_group_model.h"
-#include "ui/aura_shell/app_list/app_list_item_view.h"
+#include "ash/app_list/app_list_item_group_model.h"
+#include "ash/app_list/app_list_item_view.h"
 #include "ui/views/layout/grid_layout.h"
 
 namespace aura_shell {
diff --git a/ui/aura_shell/app_list/app_list_item_group_view.h b/ash/app_list/app_list_item_group_view.h
index 6718f9d..f2b5d19 100644
--- a/ui/aura_shell/app_list/app_list_item_group_view.h
+++ b/ash/app_list/app_list_item_group_view.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_AURA_SHELL_APP_LIST_APP_LIST_ITEM_GROUP_VIEW_H_
-#define UI_AURA_SHELL_APP_LIST_APP_LIST_ITEM_GROUP_VIEW_H_
+#ifndef ASH_APP_LIST_APP_LIST_ITEM_GROUP_VIEW_H_
+#define ASH_APP_LIST_APP_LIST_ITEM_GROUP_VIEW_H_
 #pragma once
 
 #include "ui/aura_shell/aura_shell_export.h"
@@ -62,4 +62,4 @@ class AURA_SHELL_EXPORT AppListItemGroupView
 
 }  // namespace aura_shell
 
-#endif  // UI_AURA_SHELL_APP_LIST_APP_LIST_ITEM_GROUP_VIEW_H_
+#endif  // ASH_APP_LIST_APP_LIST_ITEM_GROUP_VIEW_H_
diff --git a/ui/aura_shell/app_list/app_list_item_model.cc b/ash/app_list/app_list_item_model.cc
index a93bb8b..99708a7 100644
--- a/ui/aura_shell/app_list/app_list_item_model.cc
+++ b/ash/app_list/app_list_item_model.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/aura_shell/app_list/app_list_item_model.h"
+#include "ash/app_list/app_list_item_model.h"
 
-#include "ui/aura_shell/app_list/app_list_item_model_observer.h"
+#include "ash/app_list/app_list_item_model_observer.h"
 
 namespace aura_shell {
 
diff --git a/ui/aura_shell/app_list/app_list_item_model.h b/ash/app_list/app_list_item_model.h
index 3d5c38c..60a835f 100644
--- a/ui/aura_shell/app_list/app_list_item_model.h
+++ b/ash/app_list/app_list_item_model.h
@@ -51,4 +51,4 @@ class AURA_SHELL_EXPORT AppListItemModel {
 
 }  // namespace aura_shell
 
-#endif  // #define UI_AURA_SHELL_APP_LIST_APP_LIST_ITEM_MODEL_H_
+#endif  // #define ASH_APP_LIST_APP_LIST_ITEM_MODEL_OBSERVER_H_
diff --git a/ui/aura_shell/app_list/app_list_item_model_observer.h b/ash/app_list/app_list_item_model_observer.h
index f43d102..d44b02c8 100644
--- a/ui/aura_shell/app_list/app_list_item_model_observer.h
+++ b/ash/app_list/app_list_item_model_observer.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_AURA_SHELL_APP_LIST_APP_LIST_ITEM_MODEL_OBSERVER_H_
-#define UI_AURA_SHELL_APP_LIST_APP_LIST_ITEM_MODEL_OBSERVER_H_
+#ifndef ASH_APP_LIST_APP_LIST_ITEM_MODEL_OBSERVER_H_
+#define ASH_APP_LIST_APP_LIST_ITEM_MODEL_OBSERVER_H_
 #pragma once
 
 #include "ui/aura_shell/aura_shell_export.h"
@@ -24,4 +24,4 @@ class AURA_SHELL_EXPORT AppListItemModelObserver {
 
 }  // namespace aura_shell
 
-#endif  // UI_AURA_SHELL_APP_LIST_APP_LIST_ITEM_MODEL_OBSERVER_H_
+#endif  // ASH_APP_LIST_APP_LIST_ITEM_MODEL_OBSERVER_H_
diff --git a/ui/aura_shell/app_list/app_list_item_view.cc b/ash/app_list/app_list_item_view.cc
index afb080b..8d16f07 100644
--- a/ui/aura_shell/app_list/app_list_item_view.cc
+++ b/ash/app_list/app_list_item_view.cc
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/aura_shell/app_list/app_list_item_view.h"
+#include "ash/app_list/app_list_item_view.h"
 
+#include "ash/app_list/app_list_item_group_view.h"
+#include "ash/app_list/app_list_item_model.h"
+#include "ash/app_list/app_list_item_view_listener.h"
+#include "ash/app_list/drop_shadow_label.h"
 #include "base/utf_string_conversions.h"
 #include "third_party/skia/include/core/SkColor.h"
-#include "ui/aura_shell/app_list/app_list_item_group_view.h"
-#include "ui/aura_shell/app_list/app_list_item_model.h"
-#include "ui/aura_shell/app_list/app_list_item_view_listener.h"
-#include "ui/aura_shell/app_list/drop_shadow_label.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/font.h"
diff --git a/ui/aura_shell/app_list/app_list_item_view.h b/ash/app_list/app_list_item_view.h
index 3d8b6de..2a9ef68 100644
--- a/ui/aura_shell/app_list/app_list_item_view.h
+++ b/ash/app_list/app_list_item_view.h
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_AURA_SHELL_APP_LIST_APP_LIST_ITEM_VIEW_H_
-#define UI_AURA_SHELL_APP_LIST_APP_LIST_ITEM_VIEW_H_
+#ifndef ASH_APP_LIST_APP_LIST_ITEM_VIEW_H_
+#define ASH_APP_LIST_APP_LIST_ITEM_VIEW_H_
 #pragma once
 
-#include "ui/aura_shell/app_list/app_list_item_model_observer.h"
+#include "ash/app_list/app_list_item_model_observer.h"
 #include "ui/aura_shell/aura_shell_export.h"
 #include "ui/views/view.h"
 
@@ -69,4 +69,4 @@ class AURA_SHELL_EXPORT AppListItemView : public views::View,
 
 }  // namespace aura_shell
 
-#endif  // UI_AURA_SHELL_APP_LIST_APP_LIST_ITEM_VIEW_H_
+#endif  // ASH_APP_LIST_APP_LIST_ITEM_VIEW_H_
diff --git a/ui/aura_shell/app_list/app_list_item_view_listener.h b/ash/app_list/app_list_item_view_listener.h
index dfa2084..06dfde0 100644
--- a/ui/aura_shell/app_list/app_list_item_view_listener.h
+++ b/ash/app_list/app_list_item_view_listener.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_AURA_SHELL_APP_LIST_APP_LIST_ITEM_VIEW_LISTENER_H_
-#define UI_AURA_SHELL_APP_LIST_APP_LIST_ITEM_VIEW_LISTENER_H_
+#ifndef ASH_APP_LIST_APP_LIST_ITEM_VIEW_LISTENER_H_
+#define ASH_APP_LIST_APP_LIST_ITEM_VIEW_LISTENER_H_
 #pragma once
 
 #include "ui/aura_shell/aura_shell_export.h"
@@ -24,4 +24,4 @@ class AURA_SHELL_EXPORT AppListItemViewListener {
 
 }  // namespace aura_shell
 
-#endif  // UI_AURA_SHELL_APP_LIST_APP_LIST_ITEM_VIEW_LISTENER_H_
+#endif  // ASH_APP_LIST_APP_LIST_ITEM_VIEW_LISTENER_H_
diff --git a/ui/aura_shell/app_list/app_list_model.cc b/ash/app_list/app_list_model.cc
index 8cc531b..7b49e15 100644
--- a/ui/aura_shell/app_list/app_list_model.cc
+++ b/ash/app_list/app_list_model.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/aura_shell/app_list/app_list_model.h"
+#include "ash/app_list/app_list_model.h"
 
 namespace aura_shell {
 
diff --git a/ui/aura_shell/app_list/app_list_model.h b/ash/app_list/app_list_model.h
index f077d2c..dae1235 100644
--- a/ui/aura_shell/app_list/app_list_model.h
+++ b/ash/app_list/app_list_model.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_AURA_SHELL_APP_LIST_APP_LIST_MODEL_H_
-#define UI_AURA_SHELL_APP_LIST_APP_LIST_MODEL_H_
+#ifndef ASH_APP_LIST_APP_LIST_MODEL_H_
+#define ASH_APP_LIST_APP_LIST_MODEL_H_
 #pragma once
 
+#include "ash/app_list/app_list_item_group_model.h"
 #include "base/basictypes.h"
-#include "ui/aura_shell/app_list/app_list_item_group_model.h"
 #include "ui/aura_shell/aura_shell_export.h"
 #include "ui/base/models/list_model.h"
 
@@ -38,4 +38,4 @@ class AURA_SHELL_EXPORT AppListModel {
 
 }  // namespace aura_shell
 
-#endif  // UI_AURA_SHELL_APP_LIST_APP_LIST_MODEL_H_
+#endif  // ASH_APP_LIST_APP_LIST_MODEL_H_
diff --git a/ui/aura_shell/app_list/app_list_view.cc b/ash/app_list/app_list_view.cc
index 01eb658..52c78bf 100644
--- a/ui/aura_shell/app_list/app_list_view.cc
+++ b/ash/app_list/app_list_view.cc
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/aura_shell/app_list/app_list_view.h"
+#include "ash/app_list/app_list_view.h"
 
-#include "ui/aura_shell/app_list/app_list_groups_view.h"
-#include "ui/aura_shell/app_list/app_list_item_view.h"
-#include "ui/aura_shell/app_list/app_list_model.h"
-#include "ui/aura_shell/app_list/app_list_view_delegate.h"
+#include "ash/app_list/app_list_groups_view.h"
+#include "ash/app_list/app_list_item_view.h"
+#include "ash/app_list/app_list_model.h"
+#include "ash/app_list/app_list_view_delegate.h"
 #include "ui/aura_shell/shell.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/widget/widget.h"
diff --git a/ui/aura_shell/app_list/app_list_view.h b/ash/app_list/app_list_view.h
index 903d3a0..1e39a24 100644
--- a/ui/aura_shell/app_list/app_list_view.h
+++ b/ash/app_list/app_list_view.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_AURA_SHELL_APP_LIST_APP_LIST_VIEW_H_
-#define UI_AURA_SHELL_APP_LIST_APP_LIST_VIEW_H_
+#ifndef ASH_APP_LIST_APP_LIST_VIEW_H_
+#define ASH_APP_LIST_APP_LIST_VIEW_H_
 #pragma once
 
+#include "ash/app_list/app_list_item_view_listener.h"
 #include "base/memory/scoped_ptr.h"
-#include "ui/aura_shell/app_list/app_list_item_view_listener.h"
 #include "ui/aura_shell/aura_shell_export.h"
 #include "ui/aura_shell/shell_delegate.h"
 #include "ui/views/widget/widget_delegate.h"
@@ -58,4 +58,4 @@ class AURA_SHELL_EXPORT AppListView : public views::WidgetDelegateView,
 
 }  // namespace aura_shell
 
-#endif  // UI_AURA_SHELL_APP_LIST_APP_LIST_VIEW_H_
+#endif  // ASH_APP_LIST_APP_LIST_VIEW_H_
diff --git a/ui/aura_shell/app_list/app_list_view_delegate.h b/ash/app_list/app_list_view_delegate.h
index a73b783..7e0937a 100644
--- a/ui/aura_shell/app_list/app_list_view_delegate.h
+++ b/ash/app_list/app_list_view_delegate.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_AURA_SHELL_APP_LIST_APP_LIST_VIEW_DELEGATE_H_
-#define UI_AURA_SHELL_APP_LIST_APP_LIST_VIEW_DELEGATE_H_
+#ifndef ASH_APP_LIST_APP_LIST_VIEW_DELEGATE_H_
+#define ASH_APP_LIST_APP_LIST_VIEW_DELEGATE_H_
 #pragma once
 
 #include "ui/aura_shell/aura_shell_export.h"
@@ -24,4 +24,4 @@ class AURA_SHELL_EXPORT AppListViewDelegate {
 
 }  // namespace aura_shell
 
-#endif  // UI_AURA_SHELL_APP_LIST_APP_LIST_VIEW_DELEGATE_H_
+#endif  // ASH_APP_LIST_APP_LIST_VIEW_DELEGATE_H_
diff --git a/ui/aura_shell/app_list/drop_shadow_label.cc b/ash/app_list/drop_shadow_label.cc
index 5b85224..f227b06 100644
--- a/ui/aura_shell/app_list/drop_shadow_label.cc
+++ b/ash/app_list/drop_shadow_label.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/aura_shell/app_list/drop_shadow_label.h"
+#include "ash/app_list/drop_shadow_label.h"
 
 #include "base/utf_string_conversions.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
diff --git a/ui/aura_shell/app_list/drop_shadow_label.h b/ash/app_list/drop_shadow_label.h
index ded5e31..cfd5d55 100644
--- a/ui/aura_shell/app_list/drop_shadow_label.h
+++ b/ash/app_list/drop_shadow_label.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_AURA_SHELL_APP_LIST_DROP_SHADOW_LABEL_H_
-#define UI_AURA_SHELL_APP_LIST_DROP_SHADOW_LABEL_H_
+#ifndef ASH_APP_LIST_DROP_SHADOW_LABEL_H_
+#define ASH_APP_LIST_DROP_SHADOW_LABEL_H_
 #pragma once
 
 #include "ui/gfx/font.h"
@@ -51,4 +51,4 @@ class DropShadowLabel : public views::Label  {
 
 }  // namespace aura_shell
 
-#endif  // UI_AURA_SHELL_APP_LIST_DROP_SHADOW_LABEL_H_
+#endif  // ASH_APP_LIST_DROP_SHADOW_LABEL_H_
diff --git a/ui/aura_shell/launcher/app_launcher_button.cc b/ash/launcher/app_launcher_button.cc
index b2ee40e..9c9bd23 100644
--- a/ui/aura_shell/launcher/app_launcher_button.cc
+++ b/ash/launcher/app_launcher_button.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/aura_shell/launcher/app_launcher_button.h"
+#include "ash/launcher/app_launcher_button.h"
 
 #include <algorithm>
 
-#include "ui/aura_shell/launcher/launcher_button_host.h"
+#include "ash/launcher/launcher_button_host.h"
 #include "ui/gfx/canvas_skia.h"
 
 namespace aura_shell {
diff --git a/ui/aura_shell/launcher/app_launcher_button.h b/ash/launcher/app_launcher_button.h
index 125853d..5ee9b4c 100644
--- a/ui/aura_shell/launcher/app_launcher_button.h
+++ b/ash/launcher/app_launcher_button.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_AURA_SHELL_LAUNCHER_APP_LAUNCHER_BUTTON_H_
-#define UI_AURA_SHELL_LAUNCHER_APP_LAUNCHER_BUTTON_H_
+#ifndef ASH_LAUNCHER_APP_LAUNCHER_BUTTON_H_
+#define ASH_LAUNCHER_APP_LAUNCHER_BUTTON_H_
 #pragma once
 
 #include "ui/views/controls/button/image_button.h"
@@ -39,4 +39,4 @@ class AppLauncherButton : public views::ImageButton {
 }  // namespace internal
 }  // namespace aura_shell
 
-#endif  // UI_AURA_SHELL_LAUNCHER_APP_LAUNCHER_BUTTON_H_
+#endif  // ASH_LAUNCHER_APP_LAUNCHER_BUTTON_H_
diff --git a/ui/aura_shell/launcher/launcher.cc b/ash/launcher/launcher.cc
index 0883724e..e275552 100644
--- a/ui/aura_shell/launcher/launcher.cc
+++ b/ash/launcher/launcher.cc
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/aura_shell/launcher/launcher.h"
+#include "ash/launcher/launcher.h"
 
+#include "ash/launcher/launcher_model.h"
+#include "ash/launcher/launcher_view.h"
 #include "grit/ui_resources.h"
 #include "ui/aura/window.h"
-#include "ui/aura_shell/launcher/launcher_model.h"
-#include "ui/aura_shell/launcher/launcher_view.h"
 #include "ui/aura_shell/shell.h"
 #include "ui/aura_shell/shell_delegate.h"
 #include "ui/aura_shell/shell_window_ids.h"
diff --git a/ui/aura_shell/launcher/launcher.h b/ash/launcher/launcher.h
index b7f4ac4..e2f223c 100644
--- a/ui/aura_shell/launcher/launcher.h
+++ b/ash/launcher/launcher.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_AURA_SHELL_LAUNCHER_LAUNCHER_H_
-#define UI_AURA_SHELL_LAUNCHER_LAUNCHER_H_
+#ifndef ASH_LAUNCHER_LAUNCHER_H_
+#define ASH_LAUNCHER_LAUNCHER_H_
 #pragma once
 
 #include <map>
@@ -71,4 +71,4 @@ class AURA_SHELL_EXPORT Launcher : public aura::WindowObserver {
 
 }  // namespace aura_shell
 
-#endif  // UI_AURA_SHELL_LAUNCHER_LAUNCHER_H_
+#endif  // ASH_LAUNCHER_LAUNCHER_H_
diff --git a/ui/aura_shell/launcher/launcher_button_host.h b/ash/launcher/launcher_button_host.h
index 8d1da25..32a5241 100644
--- a/ui/aura_shell/launcher/launcher_button_host.h
+++ b/ash/launcher/launcher_button_host.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_AURA_SHELL_LAUNCHER_BUTTON_HOST_H_
-#define UI_AURA_SHELL_LAUNCHER_BUTTON_HOST_H_
+#ifndef ASH_LAUNCHER_LAUNCHER_BUTTON_HOST_H_
+#define ASH_LAUNCHER_LAUNCHER_BUTTON_HOST_H_
 #pragma once
 
 namespace views {
@@ -37,4 +37,4 @@ class LauncherButtonHost {
 }  // namespace internal
 }  // namespace aura_shell
 
-#endif  // UI_AURA_SHELL_LAUNCHER_BUTTON_HOST_H_
+#endif  // ASH_LAUNCHER_LAUNCHER_BUTTON_HOST_H_
diff --git a/ui/aura_shell/launcher/launcher_model.cc b/ash/launcher/launcher_model.cc
index 1380a12..ec19026 100644
--- a/ui/aura_shell/launcher/launcher_model.cc
+++ b/ash/launcher/launcher_model.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/aura_shell/launcher/launcher_model.h"
+#include "ash/launcher/launcher_model.h"
 
 #include "ui/aura/window.h"
-#include "ui/aura_shell/launcher/launcher_model_observer.h"
+#include "ash/launcher/launcher_model_observer.h"
 
 namespace aura_shell {
 
diff --git a/ui/aura_shell/launcher/launcher_model.h b/ash/launcher/launcher_model.h
index 2771950..a28cd31 100644
--- a/ui/aura_shell/launcher/launcher_model.h
+++ b/ash/launcher/launcher_model.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_AURA_SHELL_LAUNCHER_MODEL_H_
-#define UI_AURA_SHELL_LAUNCHER_MODEL_H_
+#ifndef ASH_LAUNCHER_LAUNCHER_MODEL_H_
+#define ASH_LAUNCHER_LAUNCHER_MODEL_H_
 #pragma once
 
 #include <vector>
 
+#include "ash/launcher/launcher_types.h"
 #include "base/observer_list.h"
 #include "ui/aura_shell/aura_shell_export.h"
-#include "ui/aura_shell/launcher/launcher_types.h"
 
 namespace aura {
 class Window;
@@ -64,4 +64,4 @@ class AURA_SHELL_EXPORT LauncherModel {
 
 }  // namespace aura_shell
 
-#endif  // UI_AURA_SHELL_LAUNCHER_MODEL_H_
+#endif  // ASH_LAUNCHER_LAUNCHER_MODEL_H_
diff --git a/ui/aura_shell/launcher/launcher_model_observer.h b/ash/launcher/launcher_model_observer.h
index a477872..4f9b7ee 100644
--- a/ui/aura_shell/launcher/launcher_model_observer.h
+++ b/ash/launcher/launcher_model_observer.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_AURA_SHELL_LAUNCHER_MODEL_OBSERVER_H_
-#define UI_AURA_SHELL_LAUNCHER_MODEL_OBSERVER_H_
+#ifndef ASH_LAUNCHER_LAUNCHER_MODEL_OBSERVER_H_
+#define ASH_LAUNCHER_LAUNCHER_MODEL_OBSERVER_H_
 #pragma once
 
 #include "ui/aura_shell/aura_shell_export.h"
@@ -36,4 +36,4 @@ class AURA_SHELL_EXPORT LauncherModelObserver {
 
 }  // namespace aura_shell
 
-#endif  // UI_AURA_SHELL_LAUNCHER_MODEL_OBSERVER_H_
+#endif  // ASH_LAUNCHER_LAUNCHER_MODEL_OBSERVER_H_
diff --git a/ui/aura_shell/launcher/launcher_model_unittest.cc b/ash/launcher/launcher_model_unittest.cc
index 1cc95f3..3c50b1e 100644
--- a/ui/aura_shell/launcher/launcher_model_unittest.cc
+++ b/ash/launcher/launcher_model_unittest.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/aura_shell/launcher/launcher_model.h"
+#include "ash/launcher/launcher_model.h"
 
+#include "ash/launcher/launcher_model_observer.h"
 #include "base/stringprintf.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "ui/aura_shell/launcher/launcher_model_observer.h"
 
 namespace aura_shell {
 
diff --git a/ui/aura_shell/launcher/launcher_types.h b/ash/launcher/launcher_types.h
index b435fa0..35150b2 100644
--- a/ui/aura_shell/launcher/launcher_types.h
+++ b/ash/launcher/launcher_types.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_AURA_SHELL_LAUNCHER_ENTRY_TYPES_H_
-#define UI_AURA_SHELL_LAUNCHER_ENTRY_TYPES_H_
+#ifndef ASH_LAUNCHER_LAUNCHER_TYPES_H_
+#define ASH_LAUNCHER_LAUNCHER_TYPES_H_
 #pragma once
 
 #include <vector>
@@ -64,4 +64,4 @@ typedef std::vector<LauncherItem> LauncherItems;
 
 }  // namespace aura_shell
 
-#endif  // UI_AURA_SHELL_LAUNCHER_ENTRY_TYPES_H_
+#endif  // ASH_LAUNCHER_LAUNCHER_TYPES_H_
diff --git a/ui/aura_shell/launcher/launcher_unittest.cc b/ash/launcher/launcher_unittest.cc
index eccef4d..de65658 100644
--- a/ui/aura_shell/launcher/launcher_unittest.cc
+++ b/ash/launcher/launcher_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/aura_shell/launcher/launcher.h"
+#include "ash/launcher/launcher.h"
 
 #include "ui/aura_shell/shell.h"
 #include "ui/aura_shell/test/aura_shell_test_base.h"
diff --git a/ui/aura_shell/launcher/launcher_view.cc b/ash/launcher/launcher_view.cc
index eb71ef2..01b69e2 100644
--- a/ui/aura_shell/launcher/launcher_view.cc
+++ b/ash/launcher/launcher_view.cc
@@ -2,17 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/aura_shell/launcher/launcher_view.h"
+#include "ash/launcher/launcher_view.h"
 
+#include "ash/launcher/app_launcher_button.h"
+#include "ash/launcher/launcher_model.h"
+#include "ash/launcher/tabbed_launcher_button.h"
+#include "ash/launcher/view_model.h"
+#include "ash/launcher/view_model_utils.h"
 #include "base/utf_string_conversions.h"
 #include "grit/ui_resources.h"
 #include "ui/aura/window.h"
-#include "ui/aura_shell/launcher/app_launcher_button.h"
-#include "ui/aura_shell/launcher/launcher_model.h"
-#include "ui/aura_shell/launcher/tabbed_launcher_button.h"
-#include "ui/aura_shell/launcher/view_model.h"
-#include "ui/aura_shell/launcher/view_model_utils.h"
-#include "ui/aura_shell/shelf_layout_manager.h"
 #include "ui/aura_shell/shell.h"
 #include "ui/aura_shell/shell_delegate.h"
 #include "ui/base/animation/animation.h"
diff --git a/ui/aura_shell/launcher/launcher_view.h b/ash/launcher/launcher_view.h
index cfff1b2..27617a0 100644
--- a/ui/aura_shell/launcher/launcher_view.h
+++ b/ash/launcher/launcher_view.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_AURA_SHELL_LAUNCHER_VIEW_H_
-#define UI_AURA_SHELL_LAUNCHER_VIEW_H_
+#ifndef ASH_LAUNCHER_LAUNCHER_VIEW_H_
+#define ASH_LAUNCHER_LAUNCHER_VIEW_H_
 #pragma once
 
 #include <vector>
 
-#include "ui/aura_shell/launcher/launcher_button_host.h"
-#include "ui/aura_shell/launcher/launcher_model_observer.h"
+#include "ash/launcher/launcher_button_host.h"
+#include "ash/launcher/launcher_model_observer.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/widget/widget_delegate.h"
 
@@ -147,4 +147,4 @@ class LauncherView : public views::WidgetDelegateView,
 }  // namespace internal
 }  // namespace aura_shell
 
-#endif  // UI_AURA_SHELL_LAUNCHER_VIEW_H_
+#endif  // ASH_LAUNCHER_LAUNCHER_VIEW_H_
diff --git a/ui/aura_shell/launcher/tabbed_launcher_button.cc b/ash/launcher/tabbed_launcher_button.cc
index 71571e8..a07b596 100644
--- a/ui/aura_shell/launcher/tabbed_launcher_button.cc
+++ b/ash/launcher/tabbed_launcher_button.cc
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/aura_shell/launcher/tabbed_launcher_button.h"
+#include "ash/launcher/tabbed_launcher_button.h"
 
 #include <algorithm>
 
+#include "ash/launcher/launcher_button_host.h"
 #include "grit/ui_resources.h"
-#include "ui/aura_shell/launcher/launcher_button_host.h"
 #include "ui/base/animation/multi_animation.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
diff --git a/ui/aura_shell/launcher/tabbed_launcher_button.h b/ash/launcher/tabbed_launcher_button.h
index 4618cc1..5e9dacd 100644
--- a/ui/aura_shell/launcher/tabbed_launcher_button.h
+++ b/ash/launcher/tabbed_launcher_button.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_AURA_SHELL_LAUNCHER_TABBED_LAUNCHER_BUTTON_H_
-#define UI_AURA_SHELL_LAUNCHER_TABBED_LAUNCHER_BUTTON_H_
+#ifndef ASH_LAUNCHER_TABBED_LAUNCHER_BUTTON_H_
+#define ASH_LAUNCHER_TABBED_LAUNCHER_BUTTON_H_
 #pragma once
 
+#include "ash/launcher/launcher_types.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/timer.h"
-#include "ui/aura_shell/launcher/launcher_types.h"
 #include "ui/base/animation/animation_delegate.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/glow_hover_controller.h"
@@ -103,4 +103,4 @@ class TabbedLauncherButton : public views::ImageButton {
 }  // namespace internal
 }  // namespace aura_shell
 
-#endif  // UI_AURA_SHELL_LAUNCHER_TABBED_LAUNCHER_BUTTON_H_
+#endif  // ASH_LAUNCHER_TABBED_LAUNCHER_BUTTON_H_
diff --git a/ui/aura_shell/launcher/view_model.cc b/ash/launcher/view_model.cc
index f59e6a8..668f16f 100644
--- a/ui/aura_shell/launcher/view_model.cc
+++ b/ash/launcher/view_model.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/aura_shell/launcher/view_model.h"
+#include "ash/launcher/view_model.h"
 
 #include "base/logging.h"
 #include "ui/views/view.h"
diff --git a/ui/aura_shell/launcher/view_model.h b/ash/launcher/view_model.h
index 738f1f4..0e81c99 100644
--- a/ui/aura_shell/launcher/view_model.h
+++ b/ash/launcher/view_model.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_AURA_SHELL_LAUNCHER_VIEW_MODEL_H_
-#define UI_AURA_SHELL_LAUNCHER_VIEW_MODEL_H_
+#ifndef ASH_LAUNCHER_VIEW_MODEL_H_
+#define ASH_LAUNCHER_VIEW_MODEL_H_
 #pragma once
 
 #include <vector>
@@ -79,4 +79,4 @@ class AURA_SHELL_EXPORT ViewModel {
 
 }  // namespace aura_shell
 
-#endif  // UI_AURA_SHELL_LAUNCHER_VIEW_MODEL_H_
+#endif  // ASH_LAUNCHER_VIEW_MODEL_H_
diff --git a/ui/aura_shell/launcher/view_model_unittest.cc b/ash/launcher/view_model_unittest.cc
index 7caadf2..17ebd23 100644
--- a/ui/aura_shell/launcher/view_model_unittest.cc
+++ b/ash/launcher/view_model_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/aura_shell/launcher/view_model.h"
+#include "ash/launcher/view_model.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/views/view.h"
diff --git a/ui/aura_shell/launcher/view_model_utils.cc b/ash/launcher/view_model_utils.cc
index de68b8e..e17370e 100644
--- a/ui/aura_shell/launcher/view_model_utils.cc
+++ b/ash/launcher/view_model_utils.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/aura_shell/launcher/view_model_utils.h"
+#include "ash/launcher/view_model_utils.h"
 
 #include <algorithm>
 
-#include "ui/aura_shell/launcher/view_model.h"
+#include "ash/launcher/view_model.h"
 #include "ui/views/view.h"
 
 namespace aura_shell {
diff --git a/ui/aura_shell/launcher/view_model_utils.h b/ash/launcher/view_model_utils.h
index ef06e5c..d6d9a9b 100644
--- a/ui/aura_shell/launcher/view_model_utils.h
+++ b/ash/launcher/view_model_utils.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_AURA_SHELL_LAUNCHER_VIEW_MODEL_UTILS_H_
-#define UI_AURA_SHELL_LAUNCHER_VIEW_MODEL_UTILS_H_
+#ifndef ASH_LAUNCHER_VIEW_MODEL_UTILS_H_
+#define ASH_LAUNCHER_VIEW_MODEL_UTILS_H_
 #pragma once
 
 #include "base/basictypes.h"
@@ -33,4 +33,4 @@ class AURA_SHELL_EXPORT ViewModelUtils {
 
 }  // namespace aura_shell
 
-#endif  // UI_AURA_SHELL_LAUNCHER_VIEW_MODEL_UTILS_H_
+#endif  // ASH_LAUNCHER_VIEW_MODEL_UTILS_H_
diff --git a/ui/aura_shell/launcher/view_model_utils_unittest.cc b/ash/launcher/view_model_utils_unittest.cc
index e49ba13..a1486d8 100644
--- a/ui/aura_shell/launcher/view_model_utils_unittest.cc
+++ b/ash/launcher/view_model_utils_unittest.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/aura_shell/launcher/view_model_utils.h"
+#include "ash/launcher/view_model_utils.h"
 
+#include "ash/launcher/view_model.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "ui/aura_shell/launcher/view_model.h"
 #include "ui/views/view.h"
 
 namespace aura_shell {
diff --git a/ash/shell/app_list.cc b/ash/shell/app_list.cc
index b8022ab..5f260cd 100644
--- a/ash/shell/app_list.cc
+++ b/ash/shell/app_list.cc
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "ash/app_list/app_list_item_group_model.h"
+#include "ash/app_list/app_list_item_model.h"
+#include "ash/app_list/app_list_item_view.h"
+#include "ash/app_list/app_list_model.h"
+#include "ash/app_list/app_list_view_delegate.h"
+#include "ash/app_list/app_list_view.h"
 #include "ash/shell/example_factory.h"
 #include "ash/shell/toplevel_window.h"
 #include "base/basictypes.h"
-#include "ui/aura_shell/app_list/app_list_item_group_model.h"
-#include "ui/aura_shell/app_list/app_list_item_model.h"
-#include "ui/aura_shell/app_list/app_list_item_view.h"
-#include "ui/aura_shell/app_list/app_list_model.h"
-#include "ui/aura_shell/app_list/app_list_view_delegate.h"
-#include "ui/aura_shell/app_list/app_list_view.h"
 #include "ui/views/examples/examples_window.h"
 
 namespace ash {
diff --git a/ash/shell/shell_main.cc b/ash/shell/shell_main.cc
index fd6e064..7142406 100644
--- a/ash/shell/shell_main.cc
+++ b/ash/shell/shell_main.cc
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "ash/launcher/launcher_types.h"
 #include "ash/shell/example_factory.h"
 #include "ash/shell/toplevel_window.h"
 #include "ash/wm/window_util.h"
@@ -11,7 +12,6 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "ui/aura/root_window.h"
-#include "ui/aura_shell/launcher/launcher_types.h"
 #include "ui/aura_shell/shell.h"
 #include "ui/aura_shell/shell_delegate.h"
 #include "ui/aura_shell/shell_factory.h"
diff --git a/ui/aura_shell/compact_layout_manager.cc b/ash/wm/compact_layout_manager.cc
index 98959d8..7bd1fb2 100644
--- a/ui/aura_shell/compact_layout_manager.cc
+++ b/ash/wm/compact_layout_manager.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/aura_shell/compact_layout_manager.h"
+#include "ash/wm/compact_layout_manager.h"
 
 #include "ash/wm/window_util.h"
 #include "ui/aura/client/aura_constants.h"
diff --git a/ui/aura_shell/compact_layout_manager.h b/ash/wm/compact_layout_manager.h
index 5d4dd85..1e713e8 100644
--- a/ui/aura_shell/compact_layout_manager.h
+++ b/ash/wm/compact_layout_manager.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_AURA_SHELL_COMPACT_LAYOUT_MANAGER_H_
-#define UI_AURA_SHELL_COMPACT_LAYOUT_MANAGER_H_
+#ifndef ASH_WM_COMPACT_LAYOUT_MANAGER_H_
+#define ASH_WM_COMPACT_LAYOUT_MANAGER_H_
 #pragma once
 
 #include <set>
@@ -63,4 +63,4 @@ class AURA_SHELL_EXPORT CompactLayoutManager : public aura::LayoutManager,
 }  // namespace aura_shell
 }  // namespace internal
 
-#endif  // UI_AURA_SHELL_COMPACT_LAYOUT_MANAGER_H_
+#endif  // ASH_WM_COMPACT_LAYOUT_MANAGER_H_
diff --git a/ui/aura_shell/compact_status_area_layout_manager.cc b/ash/wm/compact_status_area_layout_manager.cc
index a00edfb..3bbaae3 100644
--- a/ui/aura_shell/compact_status_area_layout_manager.cc
+++ b/ash/wm/compact_status_area_layout_manager.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/aura_shell/compact_status_area_layout_manager.h"
+#include "ash/wm/compact_status_area_layout_manager.h"
 
 #include "ui/gfx/rect.h"
 #include "ui/gfx/screen.h"
diff --git a/ui/aura_shell/compact_status_area_layout_manager.h b/ash/wm/compact_status_area_layout_manager.h
index 035d11c..336f02c 100644
--- a/ui/aura_shell/compact_status_area_layout_manager.h
+++ b/ash/wm/compact_status_area_layout_manager.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_AURA_SHELL_COMPACT_STATUS_AREA_LAYOUT_MANAGER_H_
-#define UI_AURA_SHELL_COMPACT_STATUS_AREA_LAYOUT_MANAGER_H_
+#ifndef ASH_WM_COMPACT_STATUS_AREA_LAYOUT_MANAGER_H_
+#define ASH_WM_COMPACT_STATUS_AREA_LAYOUT_MANAGER_H_
 #pragma once
 
 #include "base/basictypes.h"
@@ -45,4 +45,4 @@ class CompactStatusAreaLayoutManager : public aura::LayoutManager {
 }  // namespace internal
 }  // namespace aura_shell
 
-#endif  // UI_AURA_SHELL_COMPACT_STATUS_AREA_LAYOUT_MANAGER_H_
+#endif  // ASH_WM_COMPACT_STATUS_AREA_LAYOUT_MANAGER_H_
diff --git a/ui/aura_shell/shelf_layout_manager.cc b/ash/wm/shelf_layout_manager.cc
index e9ec851..05661ec 100644
--- a/ui/aura_shell/shelf_layout_manager.cc
+++ b/ash/wm/shelf_layout_manager.cc
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/aura_shell/shelf_layout_manager.h"
+#include "ash/wm/shelf_layout_manager.h"
 
+#include "ash/launcher/launcher.h"
 #include "base/auto_reset.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/screen_aura.h"
-#include "ui/aura_shell/launcher/launcher.h"
 #include "ui/aura_shell/shell.h"
 #include "ui/gfx/compositor/layer.h"
 #include "ui/gfx/compositor/layer_animator.h"
diff --git a/ui/aura_shell/shelf_layout_manager.h b/ash/wm/shelf_layout_manager.h
index f2be188..6beed27 100644
--- a/ui/aura_shell/shelf_layout_manager.h
+++ b/ash/wm/shelf_layout_manager.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_AURA_SHELL_SHELF_LAYOUT_MANAGER_H_
-#define UI_AURA_SHELL_SHELF_LAYOUT_MANAGER_H_
+#ifndef ASH_WM_SHELF_LAYOUT_MANAGER_H_
+#define ASH_WM_SHELF_LAYOUT_MANAGER_H_
 #pragma once
 
 #include "base/basictypes.h"
@@ -108,4 +108,4 @@ class AURA_SHELL_EXPORT ShelfLayoutManager : public aura::LayoutManager,
 }  // namespace internal
 }  // namespace aura_shell
 
-#endif  // UI_AURA_SHELL_SHELF_LAYOUT_MANAGER_H_
+#endif  // ASH_WM_SHELF_LAYOUT_MANAGER_H_
diff --git a/ui/aura_shell/shelf_layout_manager_unittest.cc b/ash/wm/shelf_layout_manager_unittest.cc
index 920660d..77974b1 100644
--- a/ui/aura_shell/shelf_layout_manager_unittest.cc
+++ b/ash/wm/shelf_layout_manager_unittest.cc
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/aura_shell/shelf_layout_manager.h"
+#include "ash/wm/shelf_layout_manager.h"
 
+#include "ash/launcher/launcher.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/screen_aura.h"
 #include "ui/aura/window.h"
-#include "ui/aura_shell/launcher/launcher.h"
 #include "ui/aura_shell/shell.h"
 #include "ui/aura_shell/shell_window_ids.h"
 #include "ui/aura_shell/test/aura_shell_test_base.h"
diff --git a/ui/aura_shell/status_area_layout_manager.cc b/ash/wm/status_area_layout_manager.cc
index 0ac94ed..e933f75 100644
--- a/ui/aura_shell/status_area_layout_manager.cc
+++ b/ash/wm/status_area_layout_manager.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/aura_shell/status_area_layout_manager.h"
+#include "ash/wm/status_area_layout_manager.h"
 
+#include "ash/wm/shelf_layout_manager.h"
 #include "base/auto_reset.h"
-#include "ui/aura_shell/shelf_layout_manager.h"
 
 namespace aura_shell {
 namespace internal {
diff --git a/ui/aura_shell/status_area_layout_manager.h b/ash/wm/status_area_layout_manager.h
index a5984b0..2cc3655 100644
--- a/ui/aura_shell/status_area_layout_manager.h
+++ b/ash/wm/status_area_layout_manager.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_AURA_SHELL_STATUS_AREA_LAYOUT_MANAGER_H_
-#define UI_AURA_SHELL_STATUS_AREA_LAYOUT_MANAGER_H_
+#ifndef ASH_WM_STATUS_AREA_LAYOUT_MANAGER_H_
+#define ASH_WM_STATUS_AREA_LAYOUT_MANAGER_H_
 #pragma once
 
 #include "base/basictypes.h"
@@ -49,4 +49,4 @@ class StatusAreaLayoutManager : public aura::LayoutManager {
 }  // namespace internal
 }  // namespace aura_shell
 
-#endif  // UI_AURA_SHELL_STATUS_AREA_LAYOUT_MANAGER_H_
+#endif  // ASH_WM_STATUS_AREA_LAYOUT_MANAGER_H_
diff --git a/ash/wm/toplevel_layout_manager.cc b/ash/wm/toplevel_layout_manager.cc
index d56f30b..9f7601a 100644
--- a/ash/wm/toplevel_layout_manager.cc
+++ b/ash/wm/toplevel_layout_manager.cc
@@ -4,10 +4,10 @@
 
 #include "ash/wm/toplevel_layout_manager.h"
 
+#include "ash/wm/shelf_layout_manager.h"
 #include "ash/wm/window_util.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/window.h"
-#include "ui/aura_shell/shelf_layout_manager.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/gfx/screen.h"
 
diff --git a/ash/wm/workspace_controller.cc b/ash/wm/workspace_controller.cc
index dbc2ccf..c21383a 100644
--- a/ash/wm/workspace_controller.cc
+++ b/ash/wm/workspace_controller.cc
@@ -4,6 +4,8 @@
 
 #include "ash/wm/workspace_controller.h"
 
+#include "ash/launcher/launcher.h"
+#include "ash/launcher/launcher_model.h"
 #include "ash/wm/default_container_layout_manager.h"
 #include "ash/wm/window_util.h"
 #include "ash/wm/workspace/workspace.h"
@@ -12,8 +14,6 @@
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
-#include "ui/aura_shell/launcher/launcher.h"
-#include "ui/aura_shell/launcher/launcher_model.h"
 #include "ui/aura_shell/shell.h"
 
 namespace aura_shell {
diff --git a/ash/wm/workspace_controller.h b/ash/wm/workspace_controller.h
index 587c4f9..a244e3e 100644
--- a/ash/wm/workspace_controller.h
+++ b/ash/wm/workspace_controller.h
@@ -6,13 +6,13 @@
 #define UI_AURA_SHELL_WORKSPACE_CONTROLLER_H_
 #pragma once
 
+#include "ash/launcher/launcher_model_observer.h"
 #include "ash/wm/workspace/workspace_observer.h"
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/aura/root_window_observer.h"
 #include "ui/aura/window_observer.h"
 #include "ui/aura_shell/aura_shell_export.h"
-#include "ui/aura_shell/launcher/launcher_model_observer.h"
 
 namespace aura {
 class Window;
diff --git a/chrome/browser/ui/views/aura/app_list/app_list_model_builder.cc b/chrome/browser/ui/views/aura/app_list/app_list_model_builder.cc
index f35dbb9..98c62e6 100644
--- a/chrome/browser/ui/views/aura/app_list/app_list_model_builder.cc
+++ b/chrome/browser/ui/views/aura/app_list/app_list_model_builder.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/ui/views/aura/app_list/app_list_model_builder.h"
 
+#include "ash/app_list/app_list_item_group_model.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/prefs/pref_service.h"
@@ -16,7 +17,6 @@
 #include "chrome/common/pref_names.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
-#include "ui/aura_shell/app_list/app_list_item_group_model.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace {
diff --git a/chrome/browser/ui/views/aura/app_list/app_list_model_builder.h b/chrome/browser/ui/views/aura/app_list/app_list_model_builder.h
index b42182539..1032d73 100644
--- a/chrome/browser/ui/views/aura/app_list/app_list_model_builder.h
+++ b/chrome/browser/ui/views/aura/app_list/app_list_model_builder.h
@@ -7,7 +7,7 @@
 #pragma once
 
 #include "base/gtest_prod_util.h"
-#include "ui/aura_shell/app_list/app_list_model.h"
+#include "ash/app_list/app_list_model.h"
 
 class Profile;
 
diff --git a/chrome/browser/ui/views/aura/app_list/app_list_model_builder_unittest.cc b/chrome/browser/ui/views/aura/app_list/app_list_model_builder_unittest.cc
index 4ff8338..1dfd1e5 100644
--- a/chrome/browser/ui/views/aura/app_list/app_list_model_builder_unittest.cc
+++ b/chrome/browser/ui/views/aura/app_list/app_list_model_builder_unittest.cc
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "ash/app_list/app_list_item_group_model.h"
+#include "ash/app_list/app_list_item_model.h"
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/ui/views/aura/app_list/app_list_model_builder.h"
 #include "chrome/browser/extensions/extension_service_unittest.h"
 #include "chrome/test/base/testing_profile.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "ui/aura_shell/app_list/app_list_item_group_model.h"
-#include "ui/aura_shell/app_list/app_list_item_model.h"
 
 class AppListModelBuilderTest : public ExtensionServiceTestBase {
  public:
diff --git a/chrome/browser/ui/views/aura/app_list/app_list_view_delegate.h b/chrome/browser/ui/views/aura/app_list/app_list_view_delegate.h
index 1f185f3..6b5f4a3 100644
--- a/chrome/browser/ui/views/aura/app_list/app_list_view_delegate.h
+++ b/chrome/browser/ui/views/aura/app_list/app_list_view_delegate.h
@@ -6,9 +6,9 @@
 #define CHROME_BROWSER_UI_VIEWS_AURA_APP_LIST_APP_LIST_VIEW_DELEGATE_H_
 #pragma once
 
+#include "ash/app_list/app_list_view_delegate.h"
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
-#include "ui/aura_shell/app_list/app_list_view_delegate.h"
 
 class AppListViewDelegate : public aura_shell::AppListViewDelegate {
  public:
diff --git a/chrome/browser/ui/views/aura/app_list/chrome_app_list_item.h b/chrome/browser/ui/views/aura/app_list/chrome_app_list_item.h
index ed676cc..ed53228 100644
--- a/chrome/browser/ui/views/aura/app_list/chrome_app_list_item.h
+++ b/chrome/browser/ui/views/aura/app_list/chrome_app_list_item.h
@@ -6,7 +6,7 @@
 #define CHROME_BROWSER_UI_VIEWS_AURA_APP_LIST_CHROME_APP_LIST_ITEM_H_
 #pragma once
 
-#include "ui/aura_shell/app_list/app_list_item_model.h"
+#include "ash/app_list/app_list_item_model.h"
 
 // Base class of all chrome app list items. Chrome's AppListViewDelegate assumes
 // all items are derived from this class and calls Activate when an item is
diff --git a/chrome/browser/ui/views/aura/app_list/extension_app_item.cc b/chrome/browser/ui/views/aura/app_list/extension_app_item.cc
index 73a414a..c8f9497 100644
--- a/chrome/browser/ui/views/aura/app_list/extension_app_item.cc
+++ b/chrome/browser/ui/views/aura/app_list/extension_app_item.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/ui/views/aura/app_list/extension_app_item.h"
 
+#include "ash/app_list/app_list_item_view.h"
 #include "chrome/browser/event_disposition.h"
 #include "chrome/browser/extensions/extension_prefs.h"
 #include "chrome/browser/extensions/extension_service.h"
@@ -15,7 +16,6 @@
 #include "grit/component_extension_resources_map.h"
 #include "grit/theme_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
-#include "ui/aura_shell/app_list/app_list_item_view.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/image/image.h"
diff --git a/chrome/browser/ui/views/aura/chrome_shell_delegate.cc b/chrome/browser/ui/views/aura/chrome_shell_delegate.cc
index 174885a..96d7601 100644
--- a/chrome/browser/ui/views/aura/chrome_shell_delegate.cc
+++ b/chrome/browser/ui/views/aura/chrome_shell_delegate.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/ui/views/aura/chrome_shell_delegate.h"
 
+#include "ash/launcher/launcher_types.h"
 #include "ash/wm/window_util.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser.h"
@@ -13,7 +14,6 @@
 #include "chrome/browser/ui/views/aura/status_area_host_aura.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "ui/aura/window.h"
-#include "ui/aura_shell/launcher/launcher_types.h"
 
 // static
 ChromeShellDelegate* ChromeShellDelegate::instance_ = NULL;
diff --git a/chrome/browser/ui/views/aura/chrome_shell_delegate.h b/chrome/browser/ui/views/aura/chrome_shell_delegate.h
index 99046e0..f91926f 100644
--- a/chrome/browser/ui/views/aura/chrome_shell_delegate.h
+++ b/chrome/browser/ui/views/aura/chrome_shell_delegate.h
@@ -6,10 +6,10 @@
 #define CHROME_BROWSER_UI_VIEWS_AURA_CHROME_SHELL_DELEGATE_H_
 #pragma once
 
+#include "ash/launcher/launcher_types.h"
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
-#include "ui/aura_shell/launcher/launcher_types.h"
 #include "ui/aura_shell/shell_delegate.h"
 
 class Browser;
diff --git a/chrome/browser/ui/views/aura/launcher_icon_updater.cc b/chrome/browser/ui/views/aura/launcher_icon_updater.cc
index afd4115..8739e78 100644
--- a/chrome/browser/ui/views/aura/launcher_icon_updater.cc
+++ b/chrome/browser/ui/views/aura/launcher_icon_updater.cc
@@ -4,12 +4,12 @@
 
 #include "chrome/browser/ui/views/aura/launcher_icon_updater.h"
 
+#include "ash/launcher/launcher_model.h"
 #include "chrome/browser/extensions/extension_tab_helper.h"
 #include "chrome/browser/favicon/favicon_tab_helper.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "grit/ui_resources.h"
-#include "ui/aura_shell/launcher/launcher_model.h"
 #include "ui/aura/window.h"
 #include "ui/base/resource/resource_bundle.h"
 
diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc
index 8597f9a..af90daa 100644
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -108,11 +108,11 @@
 #include "ui/views/window/dialog_delegate.h"
 
 #if defined(USE_AURA)
+#include "ash/launcher/launcher.h"
+#include "ash/launcher/launcher_model.h"
 #include "chrome/browser/ui/views/accelerator_table.h"
 #include "chrome/browser/ui/views/aura/chrome_shell_delegate.h"
 #include "chrome/browser/ui/views/aura/launcher_icon_updater.h"
-#include "ui/aura_shell/launcher/launcher.h"
-#include "ui/aura_shell/launcher/launcher_model.h"
 #include "ui/aura_shell/shell.h"
 #include "ui/gfx/screen.h"
 #elif defined(OS_WIN)
diff --git a/content/browser/gamepad/data_fetcher_win.cc b/content/browser/gamepad/data_fetcher_win.cc
index b823f27..4cb874d 100644
--- a/content/browser/gamepad/data_fetcher_win.cc
+++ b/content/browser/gamepad/data_fetcher_win.cc
@@ -69,7 +69,7 @@ bool EnableXInput() {
   // We have specified DELAYLOAD for xinput1_3.dll. If the DLL is not
   // installed (XP w/o DirectX redist installed), we disable functionality.
   __try {
-    XInputEnable(true);
+    ;//XInputEnable(true);
   } __except(DelayLoadDllExceptionFilter(GetExceptionInformation())) {
     return false;
   }
diff --git a/ui/aura_shell/aura_shell.gyp b/ui/aura_shell/aura_shell.gyp
index e820aa5..2a58545 100644
--- a/ui/aura_shell/aura_shell.gyp
+++ b/ui/aura_shell/aura_shell.gyp
@@ -35,55 +35,12 @@
         # All .cc, .h under views, except unittests
         'aura_shell_switches.cc',
         'aura_shell_switches.h',
-        'app_list/app_list.cc',
-        'app_list/app_list.h',
-        'app_list/app_list_groups_view.cc',
-        'app_list/app_list_groups_view.h',
-        'app_list/app_list_item_group_model.cc',
-        'app_list/app_list_item_group_model.h',
-        'app_list/app_list_item_group_view.cc',
-        'app_list/app_list_item_group_view.h',
-        'app_list/app_list_item_model.cc',
-        'app_list/app_list_item_model.h',
-        'app_list/app_list_item_model_observer.h',
-        'app_list/app_list_item_view.cc',
-        'app_list/app_list_item_view.h',
-        'app_list/app_list_item_view_listener.h',
-        'app_list/app_list_model.cc',
-        'app_list/app_list_model.h',
-        'app_list/app_list_view.cc',
-        'app_list/app_list_view.h',
-        'app_list/app_list_view_delegate.h',
-        'app_list/drop_shadow_label.cc',
-        'app_list/drop_shadow_label.h',
-        'compact_layout_manager.cc',
-        'compact_layout_manager.h',
-        'compact_status_area_layout_manager.cc',
-        'compact_status_area_layout_manager.h',
         'desktop_background_view.cc',
         'desktop_background_view.h',
         'drag_drop_controller.cc',
         'drag_drop_controller.h',
         'drag_image_view.cc',
         'drag_image_view.h',
-        'launcher/app_launcher_button.cc',
-        'launcher/app_launcher_button.h',
-        'launcher/launcher.cc',
-        'launcher/launcher.h',
-        'launcher/launcher_model.cc',
-        'launcher/launcher_model.h',
-        'launcher/launcher_model_observer.h',
-        'launcher/launcher_types.h',
-        'launcher/launcher_view.cc',
-        'launcher/launcher_view.h',
-        'launcher/tabbed_launcher_button.cc',
-        'launcher/tabbed_launcher_button.h',
-        'launcher/view_model.cc',
-        'launcher/view_model.h',
-        'launcher/view_model_utils.cc',
-        'launcher/view_model_utils.h',
-        'shelf_layout_manager.cc',
-        'shelf_layout_manager.h',
         'shell.cc',
         'shell.h',
         'shell_accelerator_controller.cc',
@@ -93,16 +50,55 @@
         'shell_delegate.h',
         'shell_factory.h',
         'shell_window_ids.h',
-        'status_area_layout_manager.cc',
-        'status_area_layout_manager.h',
         'status_area_view.cc',
         'status_area_view.h',
         'tooltip_controller.cc',
         'tooltip_controller.h',
+        '../../ash/app_list/app_list.cc',
+        '../../ash/app_list/app_list.h',
+        '../../ash/app_list/app_list_groups_view.cc',
+        '../../ash/app_list/app_list_groups_view.h',
+        '../../ash/app_list/app_list_item_group_model.cc',
+        '../../ash/app_list/app_list_item_group_model.h',
+        '../../ash/app_list/app_list_item_group_view.cc',
+        '../../ash/app_list/app_list_item_group_view.h',
+        '../../ash/app_list/app_list_item_model.cc',
+        '../../ash/app_list/app_list_item_model.h',
+        '../../ash/app_list/app_list_item_model_observer.h',
+        '../../ash/app_list/app_list_item_view.cc',
+        '../../ash/app_list/app_list_item_view.h',
+        '../../ash/app_list/app_list_item_view_listener.h',
+        '../../ash/app_list/app_list_model.cc',
+        '../../ash/app_list/app_list_model.h',
+        '../../ash/app_list/app_list_view.cc',
+        '../../ash/app_list/app_list_view.h',
+        '../../ash/app_list/app_list_view_delegate.h',
+        '../../ash/app_list/drop_shadow_label.cc',
+        '../../ash/app_list/drop_shadow_label.h',
+        '../../ash/launcher/app_launcher_button.cc',
+        '../../ash/launcher/app_launcher_button.h',
+        '../../ash/launcher/launcher.cc',
+        '../../ash/launcher/launcher.h',
+        '../../ash/launcher/launcher_model.cc',
+        '../../ash/launcher/launcher_model.h',
+        '../../ash/launcher/launcher_model_observer.h',
+        '../../ash/launcher/launcher_types.h',
+        '../../ash/launcher/launcher_view.cc',
+        '../../ash/launcher/launcher_view.h',
+        '../../ash/launcher/tabbed_launcher_button.cc',
+        '../../ash/launcher/tabbed_launcher_button.h',
+        '../../ash/launcher/view_model.cc',
+        '../../ash/launcher/view_model.h',
+        '../../ash/launcher/view_model_utils.cc',
+        '../../ash/launcher/view_model_utils.h',
         '../../ash/wm/activation_controller.cc',
         '../../ash/wm/activation_controller.h',
         '../../ash/wm/always_on_top_controller.cc',
         '../../ash/wm/always_on_top_controller.h',
+        '../../ash/wm/compact_layout_manager.cc',
+        '../../ash/wm/compact_layout_manager.h',
+        '../../ash/wm/compact_status_area_layout_manager.cc',
+        '../../ash/wm/compact_status_area_layout_manager.h',
         '../../ash/wm/default_container_event_filter.cc',
         '../../ash/wm/default_container_event_filter.h',
         '../../ash/wm/default_container_layout_manager.cc',
@@ -126,10 +122,14 @@
         '../../ash/wm/shadow_controller.h',
         '../../ash/wm/shadow_types.cc',
         '../../ash/wm/shadow_types.h',
+        '../../ash/wm/shelf_layout_manager.cc',
+        '../../ash/wm/shelf_layout_manager.h',
         '../../ash/wm/show_state_controller.h',
         '../../ash/wm/show_state_controller.cc',
         '../../ash/wm/stacking_controller.cc',
         '../../ash/wm/stacking_controller.h',
+        '../../ash/wm/status_area_layout_manager.cc',
+        '../../ash/wm/status_area_layout_manager.h',
         '../../ash/wm/toplevel_frame_view.cc',
         '../../ash/wm/toplevel_frame_view.h',
         '../../ash/wm/toplevel_layout_manager.cc',
@@ -175,12 +175,7 @@
       ],
       'sources': [
         'drag_drop_controller_unittest.cc',
-        'launcher/launcher_model_unittest.cc',
-        'launcher/launcher_unittest.cc',
-        'launcher/view_model_unittest.cc',
-        'launcher/view_model_utils_unittest.cc',
         'run_all_unittests.cc',
-        'shelf_layout_manager_unittest.cc',
         'shell_accelerator_controller_unittest.cc',
         'shell_unittest.cc',
         'test_suite.cc',
@@ -192,12 +187,17 @@
         'test/test_shell_delegate.cc',
         'test/test_shell_delegate.h',
         'tooltip_controller_unittest.cc',
+        '../../ash/launcher/launcher_model_unittest.cc',
+        '../../ash/launcher/launcher_unittest.cc',
+        '../../ash/launcher/view_model_unittest.cc',
+        '../../ash/launcher/view_model_utils_unittest.cc',
         '../../ash/wm/activation_controller_unittest.cc',
         '../../ash/wm/default_container_layout_manager_unittest.cc',
         '../../ash/wm/image_grid_unittest.cc',
         '../../ash/wm/modal_container_layout_manager_unittest.cc',
         '../../ash/wm/root_window_event_filter_unittest.cc',
         '../../ash/wm/shadow_controller_unittest.cc',
+        '../../ash/wm/shelf_layout_manager_unittest.cc',
         '../../ash/wm/toplevel_layout_manager_unittest.cc',
         '../../ash/wm/toplevel_window_event_filter_unittest.cc',
         '../../ash/wm/workspace_controller_unittest.cc',
diff --git a/ui/aura_shell/shell.cc b/ui/aura_shell/shell.cc
index 7c2a56c..fdb6649 100644
--- a/ui/aura_shell/shell.cc
+++ b/ui/aura_shell/shell.cc
@@ -6,14 +6,20 @@
 
 #include <algorithm>
 
+#include "ash/app_list/app_list.h"
+#include "ash/launcher/launcher.h"
+#include "ash/wm/activation_controller.h"
+#include "ash/wm/compact_layout_manager.h"
+#include "ash/wm/compact_status_area_layout_manager.h"
 #include "ash/wm/default_container_event_filter.h"
 #include "ash/wm/default_container_layout_manager.h"
+#include "ash/wm/modal_container_layout_manager.h"
 #include "ash/wm/root_window_event_filter.h"
 #include "ash/wm/root_window_layout_manager.h"
-#include "ash/wm/activation_controller.h"
-#include "ash/wm/modal_container_layout_manager.h"
 #include "ash/wm/shadow_controller.h"
+#include "ash/wm/shelf_layout_manager.h"
 #include "ash/wm/stacking_controller.h"
+#include "ash/wm/status_area_layout_manager.h"
 #include "ash/wm/toplevel_layout_manager.h"
 #include "ash/wm/toplevel_window_event_filter.h"
 #include "ash/wm/workspace_controller.h"
@@ -22,19 +28,13 @@
 #include "ui/aura/root_window.h"
 #include "ui/aura/layout_manager.h"
 #include "ui/aura/window.h"
-#include "ui/aura_shell/app_list/app_list.h"
 #include "ui/aura_shell/aura_shell_switches.h"
-#include "ui/aura_shell/compact_layout_manager.h"
-#include "ui/aura_shell/compact_status_area_layout_manager.h"
 #include "ui/aura_shell/drag_drop_controller.h"
-#include "ui/aura_shell/launcher/launcher.h"
-#include "ui/aura_shell/shelf_layout_manager.h"
 #include "ui/aura_shell/shell_accelerator_controller.h"
 #include "ui/aura_shell/shell_accelerator_filter.h"
 #include "ui/aura_shell/shell_delegate.h"
 #include "ui/aura_shell/shell_factory.h"
 #include "ui/aura_shell/shell_window_ids.h"
-#include "ui/aura_shell/status_area_layout_manager.h"
 #include "ui/aura_shell/tooltip_controller.h"
 #include "ui/gfx/compositor/layer.h"
 #include "ui/gfx/compositor/layer_animator.h"
diff --git a/ui/aura_shell/shell_accelerator_controller.cc b/ui/aura_shell/shell_accelerator_controller.cc
index 34d458b..0434c75 100644
--- a/ui/aura_shell/shell_accelerator_controller.cc
+++ b/ui/aura_shell/shell_accelerator_controller.cc
@@ -4,11 +4,11 @@
 
 #include "ui/aura_shell/shell_accelerator_controller.h"
 
+#include "ash/launcher/launcher.h"
+#include "ash/launcher/launcher_model.h"
 #include "ash/wm/window_util.h"
 #include "ui/aura/event.h"
 #include "ui/aura/root_window.h"
-#include "ui/aura_shell/launcher/launcher.h"
-#include "ui/aura_shell/launcher/launcher_model.h"
 #include "ui/aura_shell/screenshot_delegate.h"
 #include "ui/aura_shell/shell.h"
 #include "ui/aura_shell/shell_window_ids.h"