Move last few files -> ash

http://crbug.com/108457
TEST=none
TBR=sky
Review URL: http://codereview.chromium.org/9036011

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115743 0039d316-1c4b-4281-b951-d872f2087c98

9 files changed, 20 insertions, 20 deletions

diff --git a/ash/launcher/launcher.cc b/ash/launcher/launcher.cc
index e275552..cd91f0a 100644
--- a/ash/launcher/launcher.cc
+++ b/ash/launcher/launcher.cc
@@ -6,11 +6,11 @@
 
 #include "ash/launcher/launcher_model.h"
 #include "ash/launcher/launcher_view.h"
+#include "ash/shell.h"
+#include "ash/shell_delegate.h"
+#include "ash/shell_window_ids.h"
 #include "grit/ui_resources.h"
 #include "ui/aura/window.h"
-#include "ui/aura_shell/shell.h"
-#include "ui/aura_shell/shell_delegate.h"
-#include "ui/aura_shell/shell_window_ids.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/compositor/layer.h"
diff --git a/ash/launcher/launcher.h b/ash/launcher/launcher.h
index e2f223c..0e7c97b 100644
--- a/ash/launcher/launcher.h
+++ b/ash/launcher/launcher.h
@@ -11,7 +11,7 @@
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/aura/window_observer.h"
-#include "ui/aura_shell/aura_shell_export.h"
+#include "ash/ash_export.h"
 
 namespace aura {
 class Window;
@@ -25,7 +25,7 @@ namespace aura_shell {
 
 class LauncherModel;
 
-class AURA_SHELL_EXPORT Launcher : public aura::WindowObserver {
+class ASH_EXPORT Launcher : public aura::WindowObserver {
  public:
   explicit Launcher(aura::Window* window_container);
   ~Launcher();
diff --git a/ash/launcher/launcher_model.h b/ash/launcher/launcher_model.h
index a28cd31..7692843 100644
--- a/ash/launcher/launcher_model.h
+++ b/ash/launcher/launcher_model.h
@@ -10,7 +10,7 @@
 
 #include "ash/launcher/launcher_types.h"
 #include "base/observer_list.h"
-#include "ui/aura_shell/aura_shell_export.h"
+#include "ash/ash_export.h"
 
 namespace aura {
 class Window;
@@ -21,7 +21,7 @@ namespace aura_shell {
 class LauncherModelObserver;
 
 // Model used by LauncherView.
-class AURA_SHELL_EXPORT LauncherModel {
+class ASH_EXPORT LauncherModel {
  public:
   LauncherModel();
   ~LauncherModel();
diff --git a/ash/launcher/launcher_model_observer.h b/ash/launcher/launcher_model_observer.h
index 4f9b7ee..e3979c6 100644
--- a/ash/launcher/launcher_model_observer.h
+++ b/ash/launcher/launcher_model_observer.h
@@ -6,11 +6,11 @@
 #define ASH_LAUNCHER_LAUNCHER_MODEL_OBSERVER_H_
 #pragma once
 
-#include "ui/aura_shell/aura_shell_export.h"
+#include "ash/ash_export.h"
 
 namespace aura_shell {
 
-class AURA_SHELL_EXPORT LauncherModelObserver {
+class ASH_EXPORT LauncherModelObserver {
  public:
   // Invoked after an item has been added to the model.
   virtual void LauncherItemAdded(int index) = 0;
diff --git a/ash/launcher/launcher_types.h b/ash/launcher/launcher_types.h
index 35150b2..a6ac51f 100644
--- a/ash/launcher/launcher_types.h
+++ b/ash/launcher/launcher_types.h
@@ -9,7 +9,7 @@
 #include <vector>
 
 #include "third_party/skia/include/core/SkBitmap.h"
-#include "ui/aura_shell/aura_shell_export.h"
+#include "ash/ash_export.h"
 
 namespace aura {
 class Window;
@@ -18,13 +18,13 @@ class Window;
 namespace aura_shell {
 
 // Type the LauncherItem represents.
-enum AURA_SHELL_EXPORT LauncherItemType {
+enum ASH_EXPORT LauncherItemType {
   TYPE_TABBED,
   TYPE_APP
 };
 
 // Represents an image in a launcher item of type TYPE_APP.
-struct AURA_SHELL_EXPORT LauncherTabbedImage {
+struct ASH_EXPORT LauncherTabbedImage {
   LauncherTabbedImage() : user_data(NULL) {}
   LauncherTabbedImage(const SkBitmap& image, void* user_data)
       : image(image),
@@ -40,7 +40,7 @@ struct AURA_SHELL_EXPORT LauncherTabbedImage {
 
 typedef std::vector<LauncherTabbedImage> LauncherTabbedImages;
 
-struct AURA_SHELL_EXPORT LauncherItem {
+struct ASH_EXPORT LauncherItem {
   LauncherItem() : type(TYPE_TABBED), window(NULL), user_data(NULL) {}
   LauncherItem(LauncherItemType type,
                aura::Window* window,
diff --git a/ash/launcher/launcher_unittest.cc b/ash/launcher/launcher_unittest.cc
index 69ac021..60aa2f0 100644
--- a/ash/launcher/launcher_unittest.cc
+++ b/ash/launcher/launcher_unittest.cc
@@ -4,8 +4,8 @@
 
 #include "ash/launcher/launcher.h"
 
+#include "ash/shell.h"
 #include "ash/test/aura_shell_test_base.h"
-#include "ui/aura_shell/shell.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
diff --git a/ash/launcher/launcher_view.cc b/ash/launcher/launcher_view.cc
index 01b69e2..7b5d2ea 100644
--- a/ash/launcher/launcher_view.cc
+++ b/ash/launcher/launcher_view.cc
@@ -9,11 +9,11 @@
 #include "ash/launcher/tabbed_launcher_button.h"
 #include "ash/launcher/view_model.h"
 #include "ash/launcher/view_model_utils.h"
+#include "ash/shell.h"
+#include "ash/shell_delegate.h"
 #include "base/utf_string_conversions.h"
 #include "grit/ui_resources.h"
 #include "ui/aura/window.h"
-#include "ui/aura_shell/shell.h"
-#include "ui/aura_shell/shell_delegate.h"
 #include "ui/base/animation/animation.h"
 #include "ui/base/animation/throb_animation.h"
 #include "ui/base/models/simple_menu_model.h"
diff --git a/ash/launcher/view_model.h b/ash/launcher/view_model.h
index 0e81c99..67388c7 100644
--- a/ash/launcher/view_model.h
+++ b/ash/launcher/view_model.h
@@ -9,7 +9,7 @@
 #include <vector>
 
 #include "base/basictypes.h"
-#include "ui/aura_shell/aura_shell_export.h"
+#include "ash/ash_export.h"
 #include "ui/gfx/rect.h"
 
 namespace views {
@@ -23,7 +23,7 @@ namespace aura_shell {
 // coordinate conversion as you have to account for the possibility of the
 // indices from the model not lining up with those you expect. This class lets
 // you define the 'interesting' views and operate on those views.
-class AURA_SHELL_EXPORT ViewModel {
+class ASH_EXPORT ViewModel {
  public:
   ViewModel();
   ~ViewModel();
diff --git a/ash/launcher/view_model_utils.h b/ash/launcher/view_model_utils.h
index d6d9a9b..89c748c 100644
--- a/ash/launcher/view_model_utils.h
+++ b/ash/launcher/view_model_utils.h
@@ -7,7 +7,7 @@
 #pragma once
 
 #include "base/basictypes.h"
-#include "ui/aura_shell/aura_shell_export.h"
+#include "ash/ash_export.h"
 
 namespace views {
 class View;
@@ -17,7 +17,7 @@ namespace aura_shell {
 
 class ViewModel;
 
-class AURA_SHELL_EXPORT ViewModelUtils {
+class ASH_EXPORT ViewModelUtils {
  public:
   // Sets the bounds of each view to its ideal bounds.
   static void SetViewBoundsToIdealBounds(const ViewModel& model);