| Index: ui/aura/root_window.cc
|
| ===================================================================
|
| --- ui/aura/root_window.cc (revision 114593)
|
| +++ ui/aura/root_window.cc (working copy)
|
| @@ -477,9 +477,8 @@
|
| // The NULL-check of |focused)window| is essential here before asking the
|
| // activation client, since it is valid to clear the focus by calling
|
| // SetFocusedWindow() to NULL.
|
| - if (focused_window && ActivationClient::GetActivationClient() &&
|
| - !ActivationClient::GetActivationClient()->CanFocusWindow(
|
| - focused_window)) {
|
| + if (focused_window && client::GetActivationClient() &&
|
| + !client::GetActivationClient()->CanFocusWindow(focused_window)) {
|
| return;
|
| }
|
|
|
|
|