Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2113)

Unified Diff: ash/shell.cc

Issue 1151133003: Added an ActivationReason parameter to ActivationChangeObserver::OnWindowActivated(...). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Uploaded diff based on dependant CL. Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/shell.h ('k') | ash/test/test_activation_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index fb61b55893a6e7c274829105a75bea1f9966b97d..8393cda6f98449a3e0b06a32a869033797fd1305 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -1177,8 +1177,10 @@ void Shell::OnEvent(ui::Event* event) {
////////////////////////////////////////////////////////////////////////////////
// Shell, aura::client::ActivationChangeObserver implementation:
-void Shell::OnWindowActivated(aura::Window* gained_active,
- aura::Window* lost_active) {
+void Shell::OnWindowActivated(
+ aura::client::ActivationChangeObserver::ActivationReason reason,
+ aura::Window* gained_active,
+ aura::Window* lost_active) {
if (gained_active)
target_root_window_ = gained_active->GetRootWindow();
}
« no previous file with comments | « ash/shell.h ('k') | ash/test/test_activation_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698