| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 COMPONENTS_MUS_WS_DISPLAY_H_ | 5 #ifndef COMPONENTS_MUS_WS_DISPLAY_H_ |
| 6 #define COMPONENTS_MUS_WS_DISPLAY_H_ | 6 #define COMPONENTS_MUS_WS_DISPLAY_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <map> | 10 #include <map> |
| (...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 108 return const_cast<WindowManagerState*>( | 108 return const_cast<WindowManagerState*>( |
| 109 const_cast<const Display*>(this)->GetActiveWindowManagerState()); | 109 const_cast<const Display*>(this)->GetActiveWindowManagerState()); |
| 110 } | 110 } |
| 111 const WindowManagerState* GetActiveWindowManagerState() const; | 111 const WindowManagerState* GetActiveWindowManagerState() const; |
| 112 size_t num_window_manger_states() const { | 112 size_t num_window_manger_states() const { |
| 113 return window_manager_state_map_.size(); | 113 return window_manager_state_map_.size(); |
| 114 } | 114 } |
| 115 | 115 |
| 116 // TODO(sky): this should only be called by WindowServer, move to interface | 116 // TODO(sky): this should only be called by WindowServer, move to interface |
| 117 // used by WindowServer. | 117 // used by WindowServer. |
| 118 void SetFocusedWindow(ServerWindow* window); | 118 // See description of WindowServer::SetFocusedWindow() for details on return |
| 119 // value. |
| 120 bool SetFocusedWindow(ServerWindow* window); |
| 119 // NOTE: this returns the focused window only if the focused window is in this | 121 // NOTE: this returns the focused window only if the focused window is in this |
| 120 // display. If this returns null focus may be in another display. | 122 // display. If this returns null focus may be in another display. |
| 121 ServerWindow* GetFocusedWindow(); | 123 ServerWindow* GetFocusedWindow(); |
| 122 | 124 |
| 123 void ActivateNextWindow(); | 125 void ActivateNextWindow(); |
| 124 | 126 |
| 125 void AddActivationParent(ServerWindow* window); | 127 void AddActivationParent(ServerWindow* window); |
| 126 void RemoveActivationParent(ServerWindow* window); | 128 void RemoveActivationParent(ServerWindow* window); |
| 127 | 129 |
| 128 void UpdateTextInputState(ServerWindow* window, | 130 void UpdateTextInputState(ServerWindow* window, |
| (...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 218 | 220 |
| 219 cc::SurfaceId top_level_surface_id_; | 221 cc::SurfaceId top_level_surface_id_; |
| 220 | 222 |
| 221 DISALLOW_COPY_AND_ASSIGN(Display); | 223 DISALLOW_COPY_AND_ASSIGN(Display); |
| 222 }; | 224 }; |
| 223 | 225 |
| 224 } // namespace ws | 226 } // namespace ws |
| 225 } // namespace mus | 227 } // namespace mus |
| 226 | 228 |
| 227 #endif // COMPONENTS_MUS_WS_DISPLAY_H_ | 229 #endif // COMPONENTS_MUS_WS_DISPLAY_H_ |
| OLD | NEW |