Move some more WM functionality down into ash.

ash/wm/window_util.h

 // Copyright (c) 2011 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 UI_AURA_SHELL_WINDOW_UTIL_H_
-#define UI_AURA_SHELL_WINDOW_UTIL_H_
+#ifndef ASH_WM_WINDOW_UTIL_H_
+#define ASH_WM_WINDOW_UTIL_H_
 #pragma once
 
 #include "ui/aura_shell/aura_shell_export.h"
 
 namespace aura {
 class Window;
 }
 
 namespace aura_shell {
 
@@ skipping 13 matching lines @@
 // 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);
 
 // Update window bounds based on a change in show state.
 AURA_SHELL_EXPORT void UpdateBoundsFromShowState(aura::Window* window);
 
 }  // namespace aura_shell
 
-#endif  // UI_AURA_SHELL_WINDOW_UTIL_H_
+#endif  // ASH_WM_WINDOW_UTIL_H_