Index: ui/wm/core/focus_controller_unittest.cc |
diff --git a/ui/wm/core/focus_controller_unittest.cc b/ui/wm/core/focus_controller_unittest.cc |
index 84c691ff37caaec37f8c0f321313ded5b24a5c0d..11c935071598e2ca7108d33a977d50dfefbc4290 100644 |
--- a/ui/wm/core/focus_controller_unittest.cc |
+++ b/ui/wm/core/focus_controller_unittest.cc |
@@ -56,7 +56,8 @@ class FocusNotificationObserver : public aura::client::ActivationChangeObserver, |
private: |
// Overridden from aura::client::ActivationChangeObserver: |
- void OnWindowActivated(aura::Window* gained_active, |
+ void OnWindowActivated(ActivationReason reason, |
+ aura::Window* gained_active, |
aura::Window* lost_active) override { |
++activation_changed_count_; |
} |
@@ -115,7 +116,8 @@ class RecordingActivationAndFocusChangeObserver |
} |
// Overridden from aura::client::ActivationChangeObserver: |
- void OnWindowActivated(aura::Window* gained_active, |
+ void OnWindowActivated(ActivationReason reason, |
+ aura::Window* gained_active, |
aura::Window* lost_active) override { |
if (lost_active && lost_active == deleter_->GetDeletedWindow()) |
was_notified_with_deleted_window_ = true; |
@@ -158,7 +160,8 @@ class DeleteOnLoseActivationChangeObserver : |
} |
// Overridden from aura::client::ActivationChangeObserver: |
- void OnWindowActivated(aura::Window* gained_active, |
+ void OnWindowActivated(ActivationReason reason, |
+ aura::Window* gained_active, |
aura::Window* lost_active) override { |
if (window_ && lost_active == window_) { |
delete lost_active; |
@@ -303,7 +306,8 @@ class FocusShiftingActivationObserver |
private: |
// Overridden from aura::client::ActivationChangeObserver: |
- void OnWindowActivated(aura::Window* gained_active, |
+ void OnWindowActivated(ActivationReason reason, |
+ aura::Window* gained_active, |
aura::Window* lost_active) override { |
// Shift focus to a child. This should prevent the default focusing from |
// occurring in FocusController::FocusWindow(). |