Chromium Code Reviews| Index: ash/ui_controls_ash.cc |
| diff --git a/ash/ui_controls_ash.cc b/ash/ui_controls_ash.cc |
| index f2aba71303c98c5f9995eb7f1b2d42515b3ae8d7..a25410666063a81dd6bf56dedf17dbd75640716d 100644 |
| --- a/ash/ui_controls_ash.cc |
| +++ b/ash/ui_controls_ash.cc |
| @@ -37,14 +37,8 @@ ui_controls::UIControlsAura* GetUIControlsForRootWindow( |
| // UIControlsAura's root window. NULL if there is no RootWindow under |
| // the |point|. |
| ui_controls::UIControlsAura* GetUIControlsAt(gfx::Point* point) { |
|
oshima
2012/10/17 18:47:17
point_in_screen while you're at it.
mazda
2012/10/17 19:13:30
Done.
|
| - // If there is a capture events must be relative to it. |
| - aura::client::CaptureClient* capture_client = |
| - GetCaptureClient(ash::Shell::GetInstance()->GetPrimaryRootWindow()); |
| - aura::RootWindow* root = NULL; |
| - if (capture_client && capture_client->GetCaptureWindow()) |
| - root = capture_client->GetCaptureWindow()->GetRootWindow(); |
| - else |
| - root = wm::GetRootWindowAt(*point); |
| + // TODO(mazda): Support the case passive grab is taken. |
| + aura::RootWindow* root = wm::GetRootWindowAt(*point); |
| aura::client::ScreenPositionClient* screen_position_client = |
| aura::client::GetScreenPositionClient(root); |