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

Unified Diff: ash/wm/activation_controller.cc

Issue 10827145: Convert Aura to use ui::Event. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 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/wm/activation_controller.h ('k') | ash/wm/app_list_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/activation_controller.cc
===================================================================
--- ash/wm/activation_controller.cc (revision 150582)
+++ ash/wm/activation_controller.cc (working copy)
@@ -85,7 +85,7 @@
// A window manager typically defines some notion of "top level window" that
// supports activation/deactivation.
bool CanActivateWindowWithEvent(aura::Window* window,
- const aura::Event* event,
+ const ui::Event* event,
ActivateVisibilityType visibility_type) {
return window &&
VisibilityMatches(window, visibility_type) &&
@@ -130,7 +130,7 @@
// static
aura::Window* ActivationController::GetActivatableWindow(
aura::Window* window,
- const aura::Event* event) {
+ const ui::Event* event) {
aura::Window* parent = window->parent();
aura::Window* child = window;
while (parent) {
@@ -178,7 +178,7 @@
}
bool ActivationController::OnWillFocusWindow(aura::Window* window,
- const aura::Event* event) {
+ const ui::Event* event) {
return CanActivateWindowWithEvent(
GetActivatableWindow(window, event), event, CURRENT_VISIBILITY);
}
@@ -230,7 +230,7 @@
// ActivationController, private:
void ActivationController::ActivateWindowWithEvent(aura::Window* window,
- const aura::Event* event) {
+ const ui::Event* event) {
aura::Window* window_modal_transient = wm::GetWindowModalTransient(window);
if (window_modal_transient) {
ActivateWindow(window_modal_transient);
« no previous file with comments | « ash/wm/activation_controller.h ('k') | ash/wm/app_list_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698