| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 SERVICES_UI_WS_WINDOW_SERVER_H_ | 5 #ifndef SERVICES_UI_WS_WINDOW_SERVER_H_ |
| 6 #define SERVICES_UI_WS_WINDOW_SERVER_H_ | 6 #define SERVICES_UI_WS_WINDOW_SERVER_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <map> | 10 #include <map> |
| (...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 125 // Returns true if OnTreeMessagedClient() was invoked for id. | 125 // Returns true if OnTreeMessagedClient() was invoked for id. |
| 126 bool DidTreeMessageClient(ClientSpecificId id) const; | 126 bool DidTreeMessageClient(ClientSpecificId id) const; |
| 127 | 127 |
| 128 // Returns the WindowTree that has |id| as a root. | 128 // Returns the WindowTree that has |id| as a root. |
| 129 WindowTree* GetTreeWithRoot(const ServerWindow* window) { | 129 WindowTree* GetTreeWithRoot(const ServerWindow* window) { |
| 130 return const_cast<WindowTree*>( | 130 return const_cast<WindowTree*>( |
| 131 const_cast<const WindowServer*>(this)->GetTreeWithRoot(window)); | 131 const_cast<const WindowServer*>(this)->GetTreeWithRoot(window)); |
| 132 } | 132 } |
| 133 const WindowTree* GetTreeWithRoot(const ServerWindow* window) const; | 133 const WindowTree* GetTreeWithRoot(const ServerWindow* window) const; |
| 134 | 134 |
| 135 void OnFirstWindowManagerWindowTreeFactoryReady(); | |
| 136 | |
| 137 UserActivityMonitor* GetUserActivityMonitorForUser(const UserId& user_id); | 135 UserActivityMonitor* GetUserActivityMonitorForUser(const UserId& user_id); |
| 138 | 136 |
| 139 WindowManagerWindowTreeFactorySet* window_manager_window_tree_factory_set() { | 137 WindowManagerWindowTreeFactorySet* window_manager_window_tree_factory_set() { |
| 140 return &window_manager_window_tree_factory_set_; | 138 return &window_manager_window_tree_factory_set_; |
| 141 } | 139 } |
| 142 | 140 |
| 143 // Sets focus to |window|. Returns true if |window| already has focus, or | 141 // Sets focus to |window|. Returns true if |window| already has focus, or |
| 144 // focus was successfully changed. Returns |false| if |window| is not a valid | 142 // focus was successfully changed. Returns |false| if |window| is not a valid |
| 145 // window to receive focus. | 143 // window to receive focus. |
| 146 bool SetFocusedWindow(ServerWindow* window); | 144 bool SetFocusedWindow(ServerWindow* window); |
| (...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 384 // State for rendering into a Surface. | 382 // State for rendering into a Surface. |
| 385 scoped_refptr<ui::DisplayCompositor> display_compositor_; | 383 scoped_refptr<ui::DisplayCompositor> display_compositor_; |
| 386 | 384 |
| 387 DISALLOW_COPY_AND_ASSIGN(WindowServer); | 385 DISALLOW_COPY_AND_ASSIGN(WindowServer); |
| 388 }; | 386 }; |
| 389 | 387 |
| 390 } // namespace ws | 388 } // namespace ws |
| 391 } // namespace ui | 389 } // namespace ui |
| 392 | 390 |
| 393 #endif // SERVICES_UI_WS_WINDOW_SERVER_H_ | 391 #endif // SERVICES_UI_WS_WINDOW_SERVER_H_ |
| OLD | NEW |