Moves ash/wm/common back into ash

ash/wm/common/wm_window.h

 // Copyright 2016 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_WM_WINDOW_H_
 #define ASH_WM_COMMON_WM_WINDOW_H_
 
 #include <memory>
 #include <vector>
 
-#include "ash/wm/common/ash_wm_common_export.h"
+#include "ash/ash_export.h"
 #include "base/strings/string16.h"
 #include "base/time/time.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/compositor/layer_animation_element.h"
 #include "ui/wm/core/window_animations.h"
 #include "ui/wm/public/window_types.h"
 
 namespace display {
 class Display;
 }
@@ skipping 15 matching lines @@
 class WMEvent;
 class WmGlobals;
 class WmLayoutManager;
 class WmRootWindowController;
 class WmWindowObserver;
 enum class WmWindowProperty;
 class WindowState;
 
 // This class exists as a porting layer to allow ash/wm to work with
 // aura::Window or mus::Window. See aura::Window for details on the functions.
-class ASH_WM_COMMON_EXPORT WmWindow {
+class ASH_EXPORT WmWindow {
  public:
   WmWindow* GetRootWindow() {
     return const_cast<WmWindow*>(
         const_cast<const WmWindow*>(this)->GetRootWindow());
   }
   virtual const WmWindow* GetRootWindow() const = 0;
   virtual WmRootWindowController* GetRootWindowController() = 0;
 
   // TODO(sky): fix constness.
   virtual WmGlobals* GetGlobals() const = 0;
@@ skipping 160 matching lines @@
   virtual void RemoveObserver(WmWindowObserver* observer) = 0;
 
  protected:
   virtual ~WmWindow() {}
 };
 
 }  // namespace wm
 }  // namespace ash
 
 #endif  // ASH_WM_COMMON_WM_WINDOW_H_