Chromium Code Reviews| 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..14b39ce932a5a2e8ae8dd04d17603821dd94c602 100644 |
| --- a/chrome/browser/platform_util_aura.cc |
| +++ b/chrome/browser/platform_util_aura.cc |
| @@ -6,6 +6,7 @@ |
| #include "base/logging.h" |
| #include "ui/aura/window.h" |
| +#include "ui/wm/core/window_util.h" |
| #if defined(USE_ASH) |
| #include "ash/wm/window_util.h" |
| @@ -30,8 +31,7 @@ bool IsWindowActive(gfx::NativeWindow window) { |
| #if defined(USE_ASH) |
|
sky
2016/02/18 22:15:54
Can you use the non ash:: variants all the time? I
scottmg
2016/02/18 22:20:14
Done. (I didn't remove the ash::wm:: implementatio
|
| return ash::wm::IsActiveWindow(window); |
| #else |
| - NOTIMPLEMENTED(); |
| - return false; |
| + return wm::IsActiveWindow(window); |
| #endif |
| } |
| @@ -39,7 +39,7 @@ void ActivateWindow(gfx::NativeWindow window) { |
| #if defined(USE_ASH) |
| ash::wm::ActivateWindow(window); |
| #else |
| - NOTIMPLEMENTED(); |
| + wm::ActivateWindow(window); |
| #endif |
| } |