Moves ash/wm/common back into ash

ash/wm/common/background_animator.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef ASH_WM_COMMON_BACKGROUND_ANIMATOR_H_
 #define ASH_WM_COMMON_BACKGROUND_ANIMATOR_H_
 
-#include "ash/wm/common/ash_wm_common_export.h"
+#include "ash/ash_export.h"
 #include "base/macros.h"
 #include "ui/gfx/animation/animation_delegate.h"
 #include "ui/gfx/animation/slide_animation.h"
 
 namespace ash {
 
 // How the background can be changed.
 enum BackgroundAnimatorChangeType {
   BACKGROUND_CHANGE_ANIMATE,
   BACKGROUND_CHANGE_IMMEDIATE
 };
 
 // Delegate is notified any time the background changes.
-class ASH_WM_COMMON_EXPORT BackgroundAnimatorDelegate {
+class ASH_EXPORT BackgroundAnimatorDelegate {
  public:
   virtual void UpdateBackground(int alpha) = 0;
 
  protected:
   virtual ~BackgroundAnimatorDelegate() {}
 };
 
 // BackgroundAnimator is used by the shelf to animate the background (alpha).
-class ASH_WM_COMMON_EXPORT BackgroundAnimator : public gfx::AnimationDelegate {
+class ASH_EXPORT BackgroundAnimator : public gfx::AnimationDelegate {
  public:
   BackgroundAnimator(BackgroundAnimatorDelegate* delegate,
                      int min_alpha,
                      int max_alpha);
   ~BackgroundAnimator() override;
 
   // Sets the transition time in ms.
   void SetDuration(int time_in_ms);
 
   // Sets whether a background is rendered. Initial value is false. If |type|
@@ skipping 21 matching lines @@
 
   // Current alpha value of the background.
   int alpha_;
 
   DISALLOW_COPY_AND_ASSIGN(BackgroundAnimator);
 };
 
 }  // namespace ash
 
 #endif  // ASH_WM_COMMON_BACKGROUND_ANIMATOR_H_