OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #ifndef ASH_WM_ACTIVATION_CONTROLLER_H_ | 5 #ifndef ASH_WM_ACTIVATION_CONTROLLER_H_ |
6 #define ASH_WM_ACTIVATION_CONTROLLER_H_ | 6 #define ASH_WM_ACTIVATION_CONTROLLER_H_ |
7 #pragma once | 7 #pragma once |
8 | 8 |
9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
10 #include "base/compiler_specific.h" | 10 #include "base/compiler_specific.h" |
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
53 default_container_for_test_ = window; | 53 default_container_for_test_ = window; |
54 } | 54 } |
55 | 55 |
56 private: | 56 private: |
57 // Shifts activation to the next window, ignoring |window|. | 57 // Shifts activation to the next window, ignoring |window|. |
58 void ActivateNextWindow(aura::Window* window); | 58 void ActivateNextWindow(aura::Window* window); |
59 | 59 |
60 // Returns the next window that should be activated, ignoring |ignore|. | 60 // Returns the next window that should be activated, ignoring |ignore|. |
61 aura::Window* GetTopmostWindowToActivate(aura::Window* ignore) const; | 61 aura::Window* GetTopmostWindowToActivate(aura::Window* ignore) const; |
62 | 62 |
| 63 // Returns the next window that should be activated in |container| ignoring |
| 64 // the window |ignore|. |
| 65 aura::Window* GetTopmostWindowToActivateInContainer( |
| 66 aura::Window* container, |
| 67 aura::Window* ignore) const; |
| 68 |
63 // True inside ActivateWindow(). Used to prevent recursion of focus | 69 // True inside ActivateWindow(). Used to prevent recursion of focus |
64 // change notifications causing activation. | 70 // change notifications causing activation. |
65 bool updating_activation_; | 71 bool updating_activation_; |
66 | 72 |
67 // For tests that are not running with a Shell instance, | 73 // For tests that are not running with a Shell instance, |
68 // ActivationController's attempts to locate the next active window in | 74 // ActivationController's attempts to locate the next active window in |
69 // GetTopmostWindowToActivate() will crash, so we provide this way for such | 75 // GetTopmostWindowToActivate() will crash, so we provide this way for such |
70 // tests to specify a default container. | 76 // tests to specify a default container. |
71 aura::Window* default_container_for_test_; | 77 aura::Window* default_container_for_test_; |
72 | 78 |
73 DISALLOW_COPY_AND_ASSIGN(ActivationController); | 79 DISALLOW_COPY_AND_ASSIGN(ActivationController); |
74 }; | 80 }; |
75 | 81 |
76 } // namespace internal | 82 } // namespace internal |
77 } // namespace ash | 83 } // namespace ash |
78 | 84 |
79 #endif // ASH_WM_ACTIVATION_CONTROLLER_H_ | 85 #endif // ASH_WM_ACTIVATION_CONTROLLER_H_ |
OLD | NEW |