Moves ash/wm/common back into ash

ash/wm/common/wm_globals.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_GLOBALS_H_
 #define ASH_WM_COMMON_WM_GLOBALS_H_
 
 #include <stdint.h>
 
 #include <memory>
 #include <vector>
 
-#include "ash/wm/common/ash_wm_common_export.h"
+#include "ash/ash_export.h"
 
 namespace gfx {
 class Rect;
 }
 
 namespace ash {
 
 class WindowResizer;
 
 namespace wm {
 
 class WindowState;
 class WmActivationObserver;
 class WmDisplayObserver;
 class WmOverviewModeObserver;
 class WmWindow;
 
 enum class WmUserMetricsAction;
 
 // Used for accessing global state.
-class ASH_WM_COMMON_EXPORT WmGlobals {
+class ASH_EXPORT WmGlobals {
  public:
   virtual ~WmGlobals() {}
 
   // This is necessary for a handful of places that is difficult to plumb
   // through context.
   static void Set(WmGlobals* instance);
   static WmGlobals* Get();
 
   virtual WmWindow* GetFocusedWindow() = 0;
   virtual WmWindow* GetActiveWindow() = 0;
@@ skipping 47 matching lines @@
   virtual void RemoveOverviewModeObserver(WmOverviewModeObserver* observer) = 0;
 
  private:
   static WmGlobals* instance_;
 };
 
 }  // namespace wm
 }  // namespace ash
 
 #endif  // ASH_WM_COMMON_WM_GLOBALS_H_