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

Unified Diff: ash/wm/ash_activation_controller.cc

Issue 11418224: Eliminates all ash dependencies from WindowModalityController. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 1 month 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.cc ('k') | ash/wm/window_modality_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/ash_activation_controller.cc
===================================================================
--- ash/wm/ash_activation_controller.cc (revision 170295)
+++ ash/wm/ash_activation_controller.cc (working copy)
@@ -29,7 +29,7 @@
aura::Window* AshActivationController::WillActivateWindow(
aura::Window* window) {
- aura::Window* window_modal_transient = wm::GetModalTransient(window);
+ aura::Window* window_modal_transient = GetModalTransient(window);
if (window_modal_transient)
return window_modal_transient;
@@ -69,7 +69,7 @@
aura::Window* AshActivationController::WillFocusWindow(
aura::Window* window) {
- aura::Window* window_modal_transient = wm::GetModalTransient(window);
+ aura::Window* window_modal_transient = GetModalTransient(window);
if (window_modal_transient)
return window_modal_transient;
return window;
« no previous file with comments | « ash/wm/activation_controller.cc ('k') | ash/wm/window_modality_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698