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

Unified Diff: ash/wm/activation_controller.h

Issue 9568045: Activate windows in topmost containers when a window is hidden. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rename container index and remove obsolete testing path. Created 8 years, 10 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 | « no previous file | ash/wm/activation_controller.cc » ('j') | ash/wm/activation_controller.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/activation_controller.h
diff --git a/ash/wm/activation_controller.h b/ash/wm/activation_controller.h
index 6292add16d28d61b4313fbbc01bdf5567d593c78..b798b66b07a31fdfa7a371017ef6d9a79405854f 100644
--- a/ash/wm/activation_controller.h
+++ b/ash/wm/activation_controller.h
@@ -49,10 +49,6 @@ class ASH_EXPORT ActivationController
// Overridden from aura::RootWindowObserver:
virtual void OnWindowFocused(aura::Window* window) OVERRIDE;
- void set_default_container_for_test(aura::Window* window) {
- default_container_for_test_ = window;
- }
oshima 2012/03/02 19:08:40 oh, it wasn't used? glad I asked :) and thank you
-
private:
// Shifts activation to the next window, ignoring |window|.
void ActivateNextWindow(aura::Window* window);
@@ -60,16 +56,16 @@ class ASH_EXPORT ActivationController
// Returns the next window that should be activated, ignoring |ignore|.
aura::Window* GetTopmostWindowToActivate(aura::Window* ignore) const;
+ // Returns the next window that should be activated in |container| ignoring
+ // the window |ignore|.
+ aura::Window* GetTopmostWindowToActivateInContainer(
+ aura::Window* container,
+ aura::Window* ignore) const;
+
// True inside ActivateWindow(). Used to prevent recursion of focus
// change notifications causing activation.
bool updating_activation_;
- // For tests that are not running with a Shell instance,
- // ActivationController's attempts to locate the next active window in
- // GetTopmostWindowToActivate() will crash, so we provide this way for such
- // tests to specify a default container.
- aura::Window* default_container_for_test_;
-
DISALLOW_COPY_AND_ASSIGN(ActivationController);
};
« no previous file with comments | « no previous file | ash/wm/activation_controller.cc » ('j') | ash/wm/activation_controller.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698