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

Unified Diff: ui/views/widget/desktop_aura/desktop_activation_client.h

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 | « ui/views/corewm/window_util.cc ('k') | ui/views/widget/desktop_aura/desktop_activation_client.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/widget/desktop_aura/desktop_activation_client.h
===================================================================
--- ui/views/widget/desktop_aura/desktop_activation_client.h (revision 170295)
+++ ui/views/widget/desktop_aura/desktop_activation_client.h (working copy)
@@ -46,6 +46,7 @@
virtual void ActivateWindow(aura::Window* window) OVERRIDE;
virtual void DeactivateWindow(aura::Window* window) OVERRIDE;
virtual aura::Window* GetActiveWindow() OVERRIDE;
+ virtual aura::Window* GetActivatableWindow(aura::Window* window) OVERRIDE;
virtual bool OnWillFocusWindow(aura::Window* window,
const ui::Event* event) OVERRIDE;
virtual bool CanActivateWindow(aura::Window* window) const OVERRIDE;
@@ -64,10 +65,6 @@
virtual ui::EventResult OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
private:
- // Walks up the chain to find the correct parent window to activate when we
- // try to activate |window|.
- aura::Window* GetActivatableWindow(aura::Window* window);
-
void FocusWindowWithEvent(const ui::Event* event);
aura::RootWindow* root_window_;
« no previous file with comments | « ui/views/corewm/window_util.cc ('k') | ui/views/widget/desktop_aura/desktop_activation_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698