Index: ash/wm/window_util.cc |
=================================================================== |
--- ash/wm/window_util.cc (revision 126791) |
+++ ash/wm/window_util.cc (working copy) |
@@ -22,26 +22,17 @@ |
namespace wm { |
void ActivateWindow(aura::Window* window) { |
- DCHECK(window); |
- DCHECK(window->GetRootWindow()); |
- aura::client::GetActivationClient(window->GetRootWindow())->ActivateWindow( |
+ aura::client::GetActivationClient(Shell::GetRootWindow())->ActivateWindow( |
window); |
} |
void DeactivateWindow(aura::Window* window) { |
- DCHECK(window); |
- DCHECK(window->GetRootWindow()); |
- aura::client::GetActivationClient(window->GetRootWindow())->DeactivateWindow( |
+ aura::client::GetActivationClient(Shell::GetRootWindow())->DeactivateWindow( |
window); |
} |
bool IsActiveWindow(aura::Window* window) { |
- DCHECK(window); |
- if (!window->GetRootWindow()) |
- return false; |
- |
- return aura::client::GetActivationClient(window->GetRootWindow())-> |
- GetActiveWindow() == window; |
+ return GetActiveWindow() == window; |
} |
aura::Window* GetActiveWindow() { |