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

Side by Side Diff: services/ui/ws/display.h

Issue 2445873003: Pass root ServerWindow id to FrameGenerator. (Closed)
Patch Set: Change back to const ref. Created 4 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 unified diff | Download patch
« no previous file with comments | « no previous file | services/ui/ws/display.cc » ('j') | services/ui/ws/frame_generator.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 SERVICES_UI_WS_DISPLAY_H_ 5 #ifndef SERVICES_UI_WS_DISPLAY_H_
6 #define SERVICES_UI_WS_DISPLAY_H_ 6 #define SERVICES_UI_WS_DISPLAY_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <map> 10 #include <map>
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 // Inits the necessary state once the display is ready. 156 // Inits the necessary state once the display is ready.
157 void InitWindowManagerDisplayRootsIfNecessary(); 157 void InitWindowManagerDisplayRootsIfNecessary();
158 158
159 // Creates the set of WindowManagerDisplayRoots from the 159 // Creates the set of WindowManagerDisplayRoots from the
160 // WindowManagerWindowTreeFactorySet. 160 // WindowManagerWindowTreeFactorySet.
161 void CreateWindowManagerDisplayRootsFromFactories(); 161 void CreateWindowManagerDisplayRootsFromFactories();
162 162
163 void CreateWindowManagerDisplayRootFromFactory( 163 void CreateWindowManagerDisplayRootFromFactory(
164 WindowManagerWindowTreeFactory* factory); 164 WindowManagerWindowTreeFactory* factory);
165 165
166 // Creates the root ServerWindow for this display. The root window will have
167 // |size| in DIP.
sky 2016/10/25 19:23:31 I thought we were keeping mus itself pixel?
kylechar 2016/10/26 14:13:16 Mus has knowledge of DIP and DPP. The ServerWindow
kylechar 2016/10/26 14:55:23 Hmm, it seems like there has been a bit of confusi
168 void CreateRootWindow(const gfx::Size& size);
169
166 // PlatformDisplayDelegate: 170 // PlatformDisplayDelegate:
167 void CreateRootWindow(const gfx::Size& size) override;
168 ServerWindow* GetRootWindow() override; 171 ServerWindow* GetRootWindow() override;
169 bool IsInHighContrastMode() override; 172 bool IsInHighContrastMode() override;
170 void OnEvent(const ui::Event& event) override; 173 void OnEvent(const ui::Event& event) override;
171 void OnNativeCaptureLost() override; 174 void OnNativeCaptureLost() override;
172 175
173 // FocusControllerDelegate: 176 // FocusControllerDelegate:
174 bool CanHaveActiveChildren(ServerWindow* window) const override; 177 bool CanHaveActiveChildren(ServerWindow* window) const override;
175 178
176 // FocusControllerObserver: 179 // FocusControllerObserver:
177 void OnActivationChanged(ServerWindow* old_active_window, 180 void OnActivationChanged(ServerWindow* old_active_window,
(...skipping 24 matching lines...) Expand all
202 205
203 WindowManagerDisplayRootMap window_manager_display_root_map_; 206 WindowManagerDisplayRootMap window_manager_display_root_map_;
204 207
205 DISALLOW_COPY_AND_ASSIGN(Display); 208 DISALLOW_COPY_AND_ASSIGN(Display);
206 }; 209 };
207 210
208 } // namespace ws 211 } // namespace ws
209 } // namespace ui 212 } // namespace ui
210 213
211 #endif // SERVICES_UI_WS_DISPLAY_H_ 214 #endif // SERVICES_UI_WS_DISPLAY_H_
OLDNEW
« no previous file with comments | « no previous file | services/ui/ws/display.cc » ('j') | services/ui/ws/frame_generator.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698