summaryrefslogtreecommitdiffstats
path: root/ash/test/test_activation_delegate.h
diff options
context:
space:
mode:
Diffstat (limited to 'ash/test/test_activation_delegate.h')
-rw-r--r--ash/test/test_activation_delegate.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/ash/test/test_activation_delegate.h b/ash/test/test_activation_delegate.h
index 185e65d..296c903 100644
--- a/ash/test/test_activation_delegate.h
+++ b/ash/test/test_activation_delegate.h
@@ -37,7 +37,7 @@ class TestActivationDelegate : public aura::client::ActivationDelegate {
}
// Overridden from client::ActivationDelegate:
- virtual bool ShouldActivate() const OVERRIDE;
+ virtual bool ShouldActivate(const ui::Event* event) OVERRIDE;
virtual void OnActivated() OVERRIDE;
virtual void OnLostActive() OVERRIDE;
@@ -47,7 +47,7 @@ class TestActivationDelegate : public aura::client::ActivationDelegate {
bool activate_;
int activated_count_;
int lost_active_count_;
- mutable int should_activate_count_;
+ int should_activate_count_;
DISALLOW_COPY_AND_ASSIGN(TestActivationDelegate);
};