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

34 files changed, 68 insertions, 68 deletions

diff --git a/ash/wm/activation_controller.cc b/ash/wm/activation_controller.cc
index e6c4d82..faa9d92 100644
--- a/ash/wm/activation_controller.cc
+++ b/ash/wm/activation_controller.cc
@@ -4,14 +4,14 @@
 
 #include "ash/wm/activation_controller.h"
 
+#include "ash/shell.h"
+#include "ash/shell_window_ids.h"
 #include "ash/wm/window_util.h"
 #include "base/auto_reset.h"
 #include "ui/aura/client/activation_delegate.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_delegate.h"
-#include "ui/aura_shell/shell.h"
-#include "ui/aura_shell/shell_window_ids.h"
 
 namespace aura_shell {
 namespace internal {
diff --git a/ash/wm/activation_controller.h b/ash/wm/activation_controller.h
index 6a17489..911db82 100644
--- a/ash/wm/activation_controller.h
+++ b/ash/wm/activation_controller.h
@@ -12,13 +12,13 @@
 #include "ui/aura/client/activation_client.h"
 #include "ui/aura/root_window_observer.h"
 #include "ui/aura/window_observer.h"
-#include "ui/aura_shell/aura_shell_export.h"
+#include "ash/ash_export.h"
 
 namespace aura_shell {
 namespace internal {
 
 // Exported for unit tests.
-class AURA_SHELL_EXPORT ActivationController
+class ASH_EXPORT ActivationController
     : public aura::client::ActivationClient,
       public aura::WindowObserver,
       public aura::RootWindowObserver {
diff --git a/ash/wm/compact_layout_manager.h b/ash/wm/compact_layout_manager.h
index 1e713e8..0497b20 100644
--- a/ash/wm/compact_layout_manager.h
+++ b/ash/wm/compact_layout_manager.h
@@ -12,7 +12,7 @@
 #include "base/compiler_specific.h"
 #include "ui/aura/layout_manager.h"
 #include "ui/aura/window_observer.h"
-#include "ui/aura_shell/aura_shell_export.h"
+#include "ash/ash_export.h"
 
 namespace views {
 class Widget;
@@ -25,7 +25,7 @@ namespace internal {
 // hosts what the shell considers to be top-level windows. It is used for low
 // resolution screens and keeps the main browser window maximized.
 // It listens for changes to kShowStateKey and resizes the window appropriately.
-class AURA_SHELL_EXPORT CompactLayoutManager : public aura::LayoutManager,
+class ASH_EXPORT CompactLayoutManager : public aura::LayoutManager,
                                                public aura::WindowObserver {
  public:
   explicit CompactLayoutManager(views::Widget* status_area_widget);
diff --git a/ash/wm/default_container_layout_manager.h b/ash/wm/default_container_layout_manager.h
index ae52ab9..51b7bbdf 100644
--- a/ash/wm/default_container_layout_manager.h
+++ b/ash/wm/default_container_layout_manager.h
@@ -10,7 +10,7 @@
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/aura/layout_manager.h"
-#include "ui/aura_shell/aura_shell_export.h"
+#include "ash/ash_export.h"
 
 namespace aura {
 class MouseEvent;
@@ -28,7 +28,7 @@ class ShowStateController;
 class WorkspaceManager;
 
 // LayoutManager for the default window container.
-class AURA_SHELL_EXPORT DefaultContainerLayoutManager
+class ASH_EXPORT DefaultContainerLayoutManager
     : public aura::LayoutManager {
  public:
   explicit DefaultContainerLayoutManager(WorkspaceManager* workspace_manager);
diff --git a/ash/wm/image_grid.h b/ash/wm/image_grid.h
index a8a5686..38ff5a8 100644
--- a/ash/wm/image_grid.h
+++ b/ash/wm/image_grid.h
@@ -9,7 +9,7 @@
 #include "base/basictypes.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
-#include "ui/aura_shell/aura_shell_export.h"
+#include "ash/ash_export.h"
 #include "ui/gfx/compositor/layer.h"
 #include "ui/gfx/compositor/layer_delegate.h"
 #include "ui/gfx/rect.h"
@@ -58,7 +58,7 @@ namespace internal {
 //   | xXX|
 //   ...
 //
-class AURA_SHELL_EXPORT ImageGrid {
+class ASH_EXPORT ImageGrid {
  public:
   // Helper class for use by tests.
   class TestAPI {
diff --git a/ash/wm/modal_container_layout_manager.cc b/ash/wm/modal_container_layout_manager.cc
index 8619e89..7255a5e 100644
--- a/ash/wm/modal_container_layout_manager.cc
+++ b/ash/wm/modal_container_layout_manager.cc
@@ -4,6 +4,7 @@
 
 #include "ash/wm/modal_container_layout_manager.h"
 
+#include "ash/shell.h"
 #include "ash/wm/modality_event_filter.h"
 #include "ash/wm/window_util.h"
 #include "base/bind.h"
@@ -11,7 +12,6 @@
 #include "ui/aura/event.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
-#include "ui/aura_shell/shell.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/compositor/layer.h"
 #include "ui/gfx/compositor/layer_animator.h"
diff --git a/ash/wm/modal_container_layout_manager.h b/ash/wm/modal_container_layout_manager.h
index 471430b..6a67362 100644
--- a/ash/wm/modal_container_layout_manager.h
+++ b/ash/wm/modal_container_layout_manager.h
@@ -14,7 +14,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "ui/aura/layout_manager.h"
 #include "ui/aura/window_observer.h"
-#include "ui/aura_shell/aura_shell_export.h"
+#include "ash/ash_export.h"
 #include "ui/gfx/compositor/layer_animation_observer.h"
 
 namespace aura {
@@ -32,7 +32,7 @@ namespace aura_shell {
 namespace internal {
 
 // LayoutManager for the modal window container.
-class AURA_SHELL_EXPORT ModalContainerLayoutManager
+class ASH_EXPORT ModalContainerLayoutManager
     : public aura::LayoutManager,
       public aura::WindowObserver,
       public ui::LayerAnimationObserver,
diff --git a/ash/wm/modal_container_layout_manager_unittest.cc b/ash/wm/modal_container_layout_manager_unittest.cc
index 4264a86..7953004 100644
--- a/ash/wm/modal_container_layout_manager_unittest.cc
+++ b/ash/wm/modal_container_layout_manager_unittest.cc
@@ -4,14 +4,14 @@
 
 #include "ash/wm/modal_container_layout_manager.h"
 
+#include "ash/shell.h"
+#include "ash/shell_window_ids.h"
 #include "ash/test/aura_shell_test_base.h"
 #include "ash/wm/window_util.h"
 #include "base/compiler_specific.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/test/event_generator.h"
 #include "ui/aura/window.h"
-#include "ui/aura_shell/shell.h"
-#include "ui/aura_shell/shell_window_ids.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 
diff --git a/ash/wm/modality_event_filter.h b/ash/wm/modality_event_filter.h
index b3f1b7c..73d55f9 100644
--- a/ash/wm/modality_event_filter.h
+++ b/ash/wm/modality_event_filter.h
@@ -8,14 +8,14 @@
 
 #include "base/compiler_specific.h"
 #include "ui/aura/event_filter.h"
-#include "ui/aura_shell/aura_shell_export.h"
+#include "ash/ash_export.h"
 
 namespace aura_shell {
 namespace internal {
 
 class ModalityEventFilterDelegate;
 
-class AURA_SHELL_EXPORT ModalityEventFilter : public aura::EventFilter {
+class ASH_EXPORT ModalityEventFilter : public aura::EventFilter {
  public:
   ModalityEventFilter(aura::Window* container,
                       ModalityEventFilterDelegate* delegate);
diff --git a/ash/wm/modality_event_filter_delegate.h b/ash/wm/modality_event_filter_delegate.h
index 88cacba..57d9420 100644
--- a/ash/wm/modality_event_filter_delegate.h
+++ b/ash/wm/modality_event_filter_delegate.h
@@ -6,7 +6,7 @@
 #define ASH_WM_MODALITY_EVENT_FILTER_DELEGATE_H_
 #pragma once
 
-#include "ui/aura_shell/aura_shell_export.h"
+#include "ash/ash_export.h"
 
 namespace aura {
 class Window;
@@ -15,7 +15,7 @@ class Window;
 namespace aura_shell {
 namespace internal {
 
-class AURA_SHELL_EXPORT ModalityEventFilterDelegate {
+class ASH_EXPORT ModalityEventFilterDelegate {
  public:
   // Returns true if |window| can receive the specified event.
   virtual bool CanWindowReceiveEvents(aura::Window* window) = 0;
diff --git a/ash/wm/root_window_event_filter.cc b/ash/wm/root_window_event_filter.cc
index 07b37f0..7e6bdaf 100644
--- a/ash/wm/root_window_event_filter.cc
+++ b/ash/wm/root_window_event_filter.cc
@@ -4,13 +4,13 @@
 
 #include "ash/wm/root_window_event_filter.h"
 
+#include "ash/shell.h"
 #include "ash/wm/activation_controller.h"
 #include "ash/wm/window_util.h"
 #include "ui/aura/event.h"
 #include "ui/aura/focus_manager.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window_delegate.h"
-#include "ui/aura_shell/shell.h"
 #include "ui/base/hit_test.h"
 
 namespace aura_shell {
diff --git a/ash/wm/root_window_event_filter.h b/ash/wm/root_window_event_filter.h
index 294ad1f..97bbe68 100644
--- a/ash/wm/root_window_event_filter.h
+++ b/ash/wm/root_window_event_filter.h
@@ -10,7 +10,7 @@
 #include "base/observer_list.h"
 #include "ui/aura/event.h"
 #include "ui/aura/event_filter.h"
-#include "ui/aura_shell/aura_shell_export.h"
+#include "ash/ash_export.h"
 
 namespace aura_shell {
 namespace internal {
@@ -23,7 +23,7 @@ namespace internal {
 // consumed by any of those filters. If an event is consumed by a filter, the
 // rest of the filter(s) and RootWindowEventFilter will not see the consumed
 // event.
-class AURA_SHELL_EXPORT RootWindowEventFilter : public aura::EventFilter {
+class ASH_EXPORT RootWindowEventFilter : public aura::EventFilter {
  public:
   RootWindowEventFilter();
   virtual ~RootWindowEventFilter();
diff --git a/ash/wm/root_window_event_filter_unittest.cc b/ash/wm/root_window_event_filter_unittest.cc
index 7b1a2b4..708a9b8 100644
--- a/ash/wm/root_window_event_filter_unittest.cc
+++ b/ash/wm/root_window_event_filter_unittest.cc
@@ -4,6 +4,7 @@
 
 #include "ash/wm/root_window_event_filter.h"
 
+#include "ash/shell_window_ids.h"
 #include "ash/test/test_activation_delegate.h"
 #include "ash/wm/activation_controller.h"
 #include "ash/wm/window_util.h"
@@ -16,7 +17,6 @@
 #include "ui/aura/test/test_windows.h"
 #include "ui/aura/test/test_event_filter.h"
 #include "ui/aura/test/test_window_delegate.h"
-#include "ui/aura_shell/shell_window_ids.h"
 #include "ui/base/hit_test.h"
 #include "ui/gfx/screen.h"
 
diff --git a/ash/wm/shadow.h b/ash/wm/shadow.h
index ed5f393..4f82b82 100644
--- a/ash/wm/shadow.h
+++ b/ash/wm/shadow.h
@@ -8,7 +8,7 @@
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
-#include "ui/aura_shell/aura_shell_export.h"
+#include "ash/ash_export.h"
 #include "ui/gfx/rect.h"
 
 namespace ui {
@@ -21,7 +21,7 @@ namespace internal {
 class ImageGrid;
 
 // Simple class that draws a drop shadow around content at given bounds.
-class AURA_SHELL_EXPORT Shadow {
+class ASH_EXPORT Shadow {
  public:
   Shadow();
   ~Shadow();
diff --git a/ash/wm/shadow_controller.cc b/ash/wm/shadow_controller.cc
index 0193a94..b39d619 100644
--- a/ash/wm/shadow_controller.cc
+++ b/ash/wm/shadow_controller.cc
@@ -6,6 +6,7 @@
 
 #include <utility>
 
+#include "ash/ash_switches.h"
 #include "ash/wm/shadow.h"
 #include "ash/wm/shadow_types.h"
 #include "ash/wm/window_properties.h"
@@ -13,7 +14,6 @@
 #include "base/logging.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
-#include "ui/aura_shell/aura_shell_switches.h"
 
 using std::make_pair;
 
diff --git a/ash/wm/shadow_controller.h b/ash/wm/shadow_controller.h
index 82f2e45..403a658 100644
--- a/ash/wm/shadow_controller.h
+++ b/ash/wm/shadow_controller.h
@@ -13,7 +13,7 @@
 #include "base/memory/linked_ptr.h"
 #include "ui/aura/root_window_observer.h"
 #include "ui/aura/window_observer.h"
-#include "ui/aura_shell/aura_shell_export.h"
+#include "ash/ash_export.h"
 
 namespace aura {
 class Window;
@@ -29,7 +29,7 @@ class Shadow;
 
 // ShadowController observes changes to windows and creates and updates drop
 // shadows as needed.
-class AURA_SHELL_EXPORT ShadowController : public aura::RootWindowObserver,
+class ASH_EXPORT ShadowController : public aura::RootWindowObserver,
                                            public aura::WindowObserver {
 public:
   class TestApi {
diff --git a/ash/wm/shadow_controller_unittest.cc b/ash/wm/shadow_controller_unittest.cc
index 6f8efe4..9bc581c 100644
--- a/ash/wm/shadow_controller_unittest.cc
+++ b/ash/wm/shadow_controller_unittest.cc
@@ -7,6 +7,7 @@
 #include <algorithm>
 #include <vector>
 
+#include "ash/shell.h"
 #include "ash/test/aura_shell_test_base.h"
 #include "ash/wm/shadow.h"
 #include "ash/wm/shadow_types.h"
@@ -14,7 +15,6 @@
 #include "base/memory/scoped_ptr.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
-#include "ui/aura_shell/shell.h"
 #include "ui/gfx/compositor/layer.h"
 
 namespace aura_shell {
diff --git a/ash/wm/shadow_types.h b/ash/wm/shadow_types.h
index 29b85e5..59d7252 100644
--- a/ash/wm/shadow_types.h
+++ b/ash/wm/shadow_types.h
@@ -6,7 +6,7 @@
 #define ASH_WM_SHADOW_TYPES_H_
 #pragma once
 
-#include "ui/aura_shell/aura_shell_export.h"
+#include "ash/ash_export.h"
 
 namespace aura {
 class Window;
@@ -23,9 +23,9 @@ enum ShadowType {
   SHADOW_TYPE_RECTANGULAR,
 };
 
-AURA_SHELL_EXPORT void SetShadowType(aura::Window* window,
+ASH_EXPORT void SetShadowType(aura::Window* window,
                                      ShadowType shadow_type);
-AURA_SHELL_EXPORT ShadowType GetShadowType(aura::Window* window);
+ASH_EXPORT ShadowType GetShadowType(aura::Window* window);
 
 }  // namespace internal
 }  // namespace aura_shell
diff --git a/ash/wm/shelf_layout_manager.cc b/ash/wm/shelf_layout_manager.cc
index 05661ec..5c2f349 100644
--- a/ash/wm/shelf_layout_manager.cc
+++ b/ash/wm/shelf_layout_manager.cc
@@ -5,10 +5,10 @@
 #include "ash/wm/shelf_layout_manager.h"
 
 #include "ash/launcher/launcher.h"
+#include "ash/shell.h"
 #include "base/auto_reset.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/screen_aura.h"
-#include "ui/aura_shell/shell.h"
 #include "ui/gfx/compositor/layer.h"
 #include "ui/gfx/compositor/layer_animator.h"
 #include "ui/views/widget/widget.h"
diff --git a/ash/wm/shelf_layout_manager.h b/ash/wm/shelf_layout_manager.h
index 6beed27..0480313 100644
--- a/ash/wm/shelf_layout_manager.h
+++ b/ash/wm/shelf_layout_manager.h
@@ -9,7 +9,7 @@
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "ui/aura/layout_manager.h"
-#include "ui/aura_shell/aura_shell_export.h"
+#include "ash/ash_export.h"
 #include "ui/gfx/compositor/layer_animation_observer.h"
 #include "ui/gfx/insets.h"
 #include "ui/gfx/rect.h"
@@ -27,7 +27,7 @@ namespace internal {
 // layout to the status area.
 // To respond to bounds changes in the status area StatusAreaLayoutManager works
 // closely with ShelfLayoutManager.
-class AURA_SHELL_EXPORT ShelfLayoutManager : public aura::LayoutManager,
+class ASH_EXPORT ShelfLayoutManager : public aura::LayoutManager,
                                              public ui::LayerAnimationObserver {
  public:
   ShelfLayoutManager(views::Widget* launcher, views::Widget* status);
diff --git a/ash/wm/shelf_layout_manager_unittest.cc b/ash/wm/shelf_layout_manager_unittest.cc
index c1daf9a..01239c8 100644
--- a/ash/wm/shelf_layout_manager_unittest.cc
+++ b/ash/wm/shelf_layout_manager_unittest.cc
@@ -5,12 +5,12 @@
 #include "ash/wm/shelf_layout_manager.h"
 
 #include "ash/launcher/launcher.h"
+#include "ash/shell.h"
+#include "ash/shell_window_ids.h"
 #include "ash/test/aura_shell_test_base.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/screen_aura.h"
 #include "ui/aura/window.h"
-#include "ui/aura_shell/shell.h"
-#include "ui/aura_shell/shell_window_ids.h"
 #include "ui/base/animation/animation_container_element.h"
 #include "ui/gfx/compositor/layer_animator.h"
 #include "ui/gfx/compositor/layer.h"
diff --git a/ash/wm/stacking_controller.cc b/ash/wm/stacking_controller.cc
index 73b91fe..40d8f84 100644
--- a/ash/wm/stacking_controller.cc
+++ b/ash/wm/stacking_controller.cc
@@ -4,12 +4,12 @@
 
 #include "ash/wm/stacking_controller.h"
 
+#include "ash/shell.h"
+#include "ash/shell_window_ids.h"
 #include "ash/wm/always_on_top_controller.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
-#include "ui/aura_shell/shell.h"
-#include "ui/aura_shell/shell_window_ids.h"
 
 namespace aura_shell {
 namespace internal {
diff --git a/ash/wm/toplevel_frame_view.h b/ash/wm/toplevel_frame_view.h
index b76a238..2a304cb 100644
--- a/ash/wm/toplevel_frame_view.h
+++ b/ash/wm/toplevel_frame_view.h
@@ -6,7 +6,7 @@
 #define ASH_WM_TOPLEVEL_FRAME_VIEW_H_
 #pragma once
 
-#include "ui/aura_shell/aura_shell_export.h"
+#include "ash/ash_export.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/window/non_client_view.h"
 
@@ -21,7 +21,7 @@ class WindowCaption;
 // TODO(beng): Find a way to automatically this for all top-level windows in
 //             Aura. Right now windows have to override CreateNonClientFrameView
 //             on WidgetDelegate to specify this.
-class AURA_SHELL_EXPORT ToplevelFrameView : public views::NonClientFrameView {
+class ASH_EXPORT ToplevelFrameView : public views::NonClientFrameView {
  public:
   ToplevelFrameView();
   virtual ~ToplevelFrameView();
diff --git a/ash/wm/toplevel_layout_manager.h b/ash/wm/toplevel_layout_manager.h
index 7cb45ea..f7138ad 100644
--- a/ash/wm/toplevel_layout_manager.h
+++ b/ash/wm/toplevel_layout_manager.h
@@ -12,7 +12,7 @@
 #include "base/compiler_specific.h"
 #include "ui/aura/layout_manager.h"
 #include "ui/aura/window_observer.h"
-#include "ui/aura_shell/aura_shell_export.h"
+#include "ash/ash_export.h"
 
 namespace aura_shell {
 namespace internal {
@@ -23,7 +23,7 @@ class ShelfLayoutManager;
 // hosts what the shell considers to be top-level windows. It is used if the
 // WorkspaceManager is not enabled. ToplevelLayoutManager listens for changes to
 // kShowStateKey and resizes the window appropriately.
-class AURA_SHELL_EXPORT ToplevelLayoutManager : public aura::LayoutManager,
+class ASH_EXPORT ToplevelLayoutManager : public aura::LayoutManager,
                                                 public aura::WindowObserver {
  public:
   ToplevelLayoutManager();
diff --git a/ash/wm/toplevel_window_event_filter.h b/ash/wm/toplevel_window_event_filter.h
index 7eaeef7..1217d1b 100644
--- a/ash/wm/toplevel_window_event_filter.h
+++ b/ash/wm/toplevel_window_event_filter.h
@@ -10,7 +10,7 @@
 
 #include "base/compiler_specific.h"
 #include "ui/aura/event_filter.h"
-#include "ui/aura_shell/aura_shell_export.h"
+#include "ash/ash_export.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/rect.h"
 
@@ -22,7 +22,7 @@ class Window;
 
 namespace aura_shell {
 
-class AURA_SHELL_EXPORT ToplevelWindowEventFilter : public aura::EventFilter {
+class ASH_EXPORT ToplevelWindowEventFilter : public aura::EventFilter {
  public:
   explicit ToplevelWindowEventFilter(aura::Window* owner);
   virtual ~ToplevelWindowEventFilter();
diff --git a/ash/wm/window_frame.h b/ash/wm/window_frame.h
index e9f446f..e359145 100644
--- a/ash/wm/window_frame.h
+++ b/ash/wm/window_frame.h
@@ -6,16 +6,16 @@
 #define ASH_WM_WINDOW_FRAME_H_
 #pragma once
 
-#include "ui/aura_shell/aura_shell_export.h"
+#include "ash/ash_export.h"
 
 namespace aura_shell {
 
 // aura::Window property name for a pointer to the WindowFrame interface.
-AURA_SHELL_EXPORT extern const char* const kWindowFrameKey;
+ASH_EXPORT extern const char* const kWindowFrameKey;
 
 // Interface for clients implementing a window frame.  Implementors should
 // add a pointer to this interface to each aura::Window, using the key above.
-class AURA_SHELL_EXPORT WindowFrame {
+class ASH_EXPORT WindowFrame {
  public:
   virtual ~WindowFrame() {}
 
diff --git a/ash/wm/window_util.h b/ash/wm/window_util.h
index 8838d89..bba1c26 100644
--- a/ash/wm/window_util.h
+++ b/ash/wm/window_util.h
@@ -8,7 +8,7 @@
 
 #include <set>
 
-#include "ui/aura_shell/aura_shell_export.h"
+#include "ash/ash_export.h"
 
 namespace aura {
 class Window;
@@ -19,27 +19,27 @@ namespace aura_shell {
 // TODO(jamescook): Put all these functions in namespace window_util.
 
 // Returns true if |window| is in the maximized state.
-AURA_SHELL_EXPORT bool IsWindowMaximized(aura::Window* window);
+ASH_EXPORT bool IsWindowMaximized(aura::Window* window);
 
 // Convenience setters/getters for |aura::client::kRootWindowActiveWindow|.
-AURA_SHELL_EXPORT void ActivateWindow(aura::Window* window);
-AURA_SHELL_EXPORT void DeactivateWindow(aura::Window* window);
-AURA_SHELL_EXPORT bool IsActiveWindow(aura::Window* window);
-AURA_SHELL_EXPORT aura::Window* GetActiveWindow();
+ASH_EXPORT void ActivateWindow(aura::Window* window);
+ASH_EXPORT void DeactivateWindow(aura::Window* window);
+ASH_EXPORT bool IsActiveWindow(aura::Window* window);
+ASH_EXPORT aura::Window* GetActiveWindow();
 
 // Retrieves the activatable window for |window|. If |window| is activatable,
 // this will just return it, otherwise it will climb the parent/transient parent
 // chain looking for a window that is activatable, per the ActivationController.
 // If you're looking for a function to get the activatable "top level" window,
 // this is probably what you're looking for.
-AURA_SHELL_EXPORT aura::Window* GetActivatableWindow(aura::Window* window);
+ASH_EXPORT aura::Window* GetActivatableWindow(aura::Window* window);
 
 // Update window bounds based on a change in show state.
-AURA_SHELL_EXPORT void UpdateBoundsFromShowState(aura::Window* window);
+ASH_EXPORT void UpdateBoundsFromShowState(aura::Window* window);
 
 // Returns true if the set of |windows| contains a full-screen window.
 typedef std::set<aura::Window*> WindowSet;
-AURA_SHELL_EXPORT bool HasFullscreenWindow(const WindowSet& windows);
+ASH_EXPORT bool HasFullscreenWindow(const WindowSet& windows);
 
 }  // namespace aura_shell
 
diff --git a/ash/wm/workspace/workspace.h b/ash/wm/workspace/workspace.h
index 822e677..4256fab 100644
--- a/ash/wm/workspace/workspace.h
+++ b/ash/wm/workspace/workspace.h
@@ -9,7 +9,7 @@
 
 #include "base/basictypes.h"
 #include "base/gtest_prod_util.h"
-#include "ui/aura_shell/aura_shell_export.h"
+#include "ash/ash_export.h"
 #include "ui/gfx/rect.h"
 
 namespace aura {
@@ -29,7 +29,7 @@ class WorkspaceTest;
 // A workspace contains a limited number of windows and the workspace
 // manager may create a new workspace if there is not enough room for
 // a new window.
-class AURA_SHELL_EXPORT Workspace {
+class ASH_EXPORT Workspace {
  public:
   explicit Workspace(WorkspaceManager* manager);
   virtual ~Workspace();
diff --git a/ash/wm/workspace/workspace_manager.h b/ash/wm/workspace/workspace_manager.h
index 6ad105c..69711c9 100644
--- a/ash/wm/workspace/workspace_manager.h
+++ b/ash/wm/workspace/workspace_manager.h
@@ -10,7 +10,7 @@
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/observer_list.h"
-#include "ui/aura_shell/aura_shell_export.h"
+#include "ash/ash_export.h"
 #include "ui/gfx/insets.h"
 #include "ui/gfx/size.h"
 
@@ -29,7 +29,7 @@ class Workspace;
 class WorkspaceObserver;
 
 // WorkspaceManager manages multiple workspaces in the desktop.
-class AURA_SHELL_EXPORT WorkspaceManager {
+class ASH_EXPORT WorkspaceManager {
  public:
   explicit WorkspaceManager(aura::Window* viewport);
   virtual ~WorkspaceManager();
diff --git a/ash/wm/workspace/workspace_manager_unittest.cc b/ash/wm/workspace/workspace_manager_unittest.cc
index 55123a8..92062ca 100644
--- a/ash/wm/workspace/workspace_manager_unittest.cc
+++ b/ash/wm/workspace/workspace_manager_unittest.cc
@@ -4,6 +4,7 @@
 
 #include "ash/wm/workspace/workspace_manager.h"
 
+#include "ash/shell_window_ids.h"
 #include "ash/wm/activation_controller.h"
 #include "ash/wm/workspace/workspace.h"
 #include "ash/wm/workspace/workspace_observer.h"
@@ -12,7 +13,6 @@
 #include "ui/aura/screen_aura.h"
 #include "ui/aura/test/aura_test_base.h"
 #include "ui/aura/window.h"
-#include "ui/aura_shell/shell_window_ids.h"
 #include "ui/base/ui_base_types.h"
 
 namespace {
diff --git a/ash/wm/workspace/workspace_observer.h b/ash/wm/workspace/workspace_observer.h
index eb993b8..45439e3 100644
--- a/ash/wm/workspace/workspace_observer.h
+++ b/ash/wm/workspace/workspace_observer.h
@@ -6,7 +6,7 @@
 #define ASH_WM_WORKSPACE_WORKSPACE_OBSERVER_H_
 #pragma once
 
-#include "ui/aura_shell/aura_shell_export.h"
+#include "ash/ash_export.h"
 
 namespace aura {
 class Window;
@@ -18,7 +18,7 @@ class Workspace;
 class WorkspaceManager;
 
 // A class to observe changes in workspace state.
-class AURA_SHELL_EXPORT WorkspaceObserver {
+class ASH_EXPORT WorkspaceObserver {
  public:
   // Invoked when |start| window is moved and inserted
   // at the |target| window's position by |WorkspaceManager::RotateWindow|.
diff --git a/ash/wm/workspace_controller.cc b/ash/wm/workspace_controller.cc
index c21383a..9faafd8 100644
--- a/ash/wm/workspace_controller.cc
+++ b/ash/wm/workspace_controller.cc
@@ -6,6 +6,7 @@
 
 #include "ash/launcher/launcher.h"
 #include "ash/launcher/launcher_model.h"
+#include "ash/shell.h"
 #include "ash/wm/default_container_layout_manager.h"
 #include "ash/wm/window_util.h"
 #include "ash/wm/workspace/workspace.h"
@@ -14,7 +15,6 @@
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
-#include "ui/aura_shell/shell.h"
 
 namespace aura_shell {
 namespace internal {
diff --git a/ash/wm/workspace_controller.h b/ash/wm/workspace_controller.h
index a244e3e..771f5b9 100644
--- a/ash/wm/workspace_controller.h
+++ b/ash/wm/workspace_controller.h
@@ -12,7 +12,7 @@
 #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 "ash/ash_export.h"
 
 namespace aura {
 class Window;
@@ -32,7 +32,7 @@ class WorkspaceManager;
 // WorkspaceControlls owns a WorkspaceManager. WorkspaceControlls bridges
 // events From RootWindowObserver translating them to WorkspaceManager, and
 // a move event between Laucher and Workspace.
-class AURA_SHELL_EXPORT WorkspaceController :
+class ASH_EXPORT WorkspaceController :
       public aura::RootWindowObserver,
       public aura::WindowObserver,
       public aura_shell::internal::WorkspaceObserver,
diff --git a/ash/wm/workspace_controller_unittest.cc b/ash/wm/workspace_controller_unittest.cc
index 023368e..e470a0f 100644
--- a/ash/wm/workspace_controller_unittest.cc
+++ b/ash/wm/workspace_controller_unittest.cc
@@ -4,6 +4,7 @@
 
 #include "ash/wm/workspace_controller.h"
 
+#include "ash/shell_window_ids.h"
 #include "ash/wm/activation_controller.h"
 #include "ash/wm/window_util.h"
 #include "ash/wm/workspace/workspace.h"
@@ -11,7 +12,6 @@
 #include "ui/aura/test/aura_test_base.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
-#include "ui/aura_shell/shell_window_ids.h"
 
 namespace aura_shell {
 namespace internal {