| Index: ui/aura/test/test_activation_client.cc
|
| ===================================================================
|
| --- ui/aura/test/test_activation_client.cc (revision 114593)
|
| +++ ui/aura/test/test_activation_client.cc (working copy)
|
| @@ -13,14 +13,14 @@
|
| // TestActivationClient, public:
|
|
|
| TestActivationClient::TestActivationClient() : active_window_(NULL) {
|
| - ActivationClient::SetActivationClient(this);
|
| + client::SetActivationClient(this);
|
| }
|
|
|
| TestActivationClient::~TestActivationClient() {
|
| }
|
|
|
| ////////////////////////////////////////////////////////////////////////////////
|
| -// TestActivationClient, ActivationClient implementation:
|
| +// TestActivationClient, client::ActivationClient implementation:
|
|
|
| void TestActivationClient::ActivateWindow(Window* window) {
|
| if (active_window_)
|
|
|