| Index: ui/aura_shell/test/test_activation_delegate.h
|
| ===================================================================
|
| --- ui/aura_shell/test/test_activation_delegate.h (revision 114593)
|
| +++ ui/aura_shell/test/test_activation_delegate.h (working copy)
|
| @@ -19,7 +19,7 @@
|
|
|
| // A test ActivationDelegate that can be used to track activation changes for
|
| // an aura::Window.
|
| -class TestActivationDelegate : public aura::ActivationDelegate {
|
| +class TestActivationDelegate : public aura::client::ActivationDelegate {
|
| public:
|
| TestActivationDelegate();
|
| explicit TestActivationDelegate(bool activate);
|
| @@ -37,7 +37,7 @@
|
| window_was_active_ = false;
|
| }
|
|
|
| - // Overridden from ActivationDelegate:
|
| + // Overridden from client::ActivationDelegate:
|
| virtual bool ShouldActivate(aura::Event* event) OVERRIDE;
|
| virtual void OnActivated() OVERRIDE;
|
| virtual void OnLostActive() OVERRIDE;
|
|
|