Index: chrome/browser/platform_util_aura.cc |
diff --git a/chrome/browser/platform_util_aura.cc b/chrome/browser/platform_util_aura.cc |
index db3a343893373b0ddca83fbdbbe1d47a4cbffbc3..16c3e2b80eca333a35b59413640e92106e472ffc 100644 |
--- a/chrome/browser/platform_util_aura.cc |
+++ b/chrome/browser/platform_util_aura.cc |
@@ -6,10 +6,7 @@ |
#include "base/logging.h" |
#include "ui/aura/window.h" |
- |
-#if defined(USE_ASH) |
-#include "ash/wm/window_util.h" |
-#endif |
+#include "ui/wm/core/window_util.h" |
namespace platform_util { |
@@ -27,20 +24,11 @@ gfx::NativeView GetParent(gfx::NativeView view) { |
} |
bool IsWindowActive(gfx::NativeWindow window) { |
-#if defined(USE_ASH) |
- return ash::wm::IsActiveWindow(window); |
-#else |
- NOTIMPLEMENTED(); |
- return false; |
-#endif |
+ return wm::IsActiveWindow(window); |
} |
void ActivateWindow(gfx::NativeWindow window) { |
-#if defined(USE_ASH) |
- ash::wm::ActivateWindow(window); |
-#else |
- NOTIMPLEMENTED(); |
-#endif |
+ wm::ActivateWindow(window); |
} |
bool IsVisible(gfx::NativeView view) { |