| Index: ui/aura/client/activation_client.cc
|
| diff --git a/ui/aura/client/activation_client.cc b/ui/aura/client/activation_client.cc
|
| index b55702381eaa618caca9c1a295695e33cd618bfc..b4633aec5abc9cd92a3718e8c4cf53c6f48731d3 100644
|
| --- a/ui/aura/client/activation_client.cc
|
| +++ b/ui/aura/client/activation_client.cc
|
| @@ -17,11 +17,11 @@ DEFINE_WINDOW_PROPERTY_KEY(
|
| ActivationClient*, kRootWindowActivationClientKey, NULL);
|
| DEFINE_WINDOW_PROPERTY_KEY(bool, kHideOnDeactivate, false);
|
|
|
| -void SetActivationClient(RootWindow* root_window, ActivationClient* client) {
|
| +void SetActivationClient(Window* root_window, ActivationClient* client) {
|
| root_window->SetProperty(kRootWindowActivationClientKey, client);
|
| }
|
|
|
| -ActivationClient* GetActivationClient(RootWindow* root_window) {
|
| +ActivationClient* GetActivationClient(Window* root_window) {
|
| return root_window ?
|
| root_window->GetProperty(kRootWindowActivationClientKey) : NULL;
|
| }
|
|
|