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

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

Issue 2491493004: Fix root ServerWindow size. (Closed)
Patch Set: 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') | no next file with comments »
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 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 130
131 // Called just before |tree| is destroyed. 131 // Called just before |tree| is destroyed.
132 void OnWillDestroyTree(WindowTree* tree); 132 void OnWillDestroyTree(WindowTree* tree);
133 133
134 void UpdateNativeCursor(mojom::Cursor cursor_id); 134 void UpdateNativeCursor(mojom::Cursor cursor_id);
135 135
136 // mojom::WindowTreeHost: 136 // mojom::WindowTreeHost:
137 void SetSize(const gfx::Size& size) override; 137 void SetSize(const gfx::Size& size) override;
138 void SetTitle(const mojo::String& title) override; 138 void SetTitle(const mojo::String& title) override;
139 139
140 // Updates the root window, if necessary, for viewport metric changes. 140 // Updates the size of display root ServerWindow and WM ServerWindow(s) for
msw 2016/11/09 20:57:18 nit: "the display's root ServerWindow"? and "for t
kylechar 2016/11/09 21:36:56 Changed method otherwise.
141 void OnViewportMetricsChanged(const display::ViewportMetrics& new_metrics); 141 // new |size| if necessary. |size| is in physical pixels.
142 void UpdateRootWindowSize(const gfx::Size& new_size);
msw 2016/11/09 20:57:18 Would it make sense to keep this as OnViewportMetr
kylechar 2016/11/09 21:36:56 Hmm, we're not using the rest of the values now..
142 143
143 private: 144 private:
144 friend class test::DisplayTestApi; 145 friend class test::DisplayTestApi;
145 146
146 using WindowManagerDisplayRootMap = 147 using WindowManagerDisplayRootMap =
147 std::map<UserId, WindowManagerDisplayRoot*>; 148 std::map<UserId, WindowManagerDisplayRoot*>;
148 149
149 // Inits the necessary state once the display is ready. 150 // Inits the necessary state once the display is ready.
150 void InitWindowManagerDisplayRootsIfNecessary(); 151 void InitWindowManagerDisplayRootsIfNecessary();
151 152
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
198 199
199 WindowManagerDisplayRootMap window_manager_display_root_map_; 200 WindowManagerDisplayRootMap window_manager_display_root_map_;
200 201
201 DISALLOW_COPY_AND_ASSIGN(Display); 202 DISALLOW_COPY_AND_ASSIGN(Display);
202 }; 203 };
203 204
204 } // namespace ws 205 } // namespace ws
205 } // namespace ui 206 } // namespace ui
206 207
207 #endif // SERVICES_UI_WS_DISPLAY_H_ 208 #endif // SERVICES_UI_WS_DISPLAY_H_
OLDNEW
« no previous file with comments | « no previous file | services/ui/ws/display.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698