Chromium Code Reviews| 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 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 142 | 142 |
| 143 // Called when the window tree when stacking and bounds of a window | 143 // Called when the window tree when stacking and bounds of a window |
| 144 // change. This may update the cursor if the ServerWindow under the last | 144 // change. This may update the cursor if the ServerWindow under the last |
| 145 // known pointer location changed. | 145 // known pointer location changed. |
| 146 void MaybeChangeCursorOnWindowTreeChange(); | 146 void MaybeChangeCursorOnWindowTreeChange(); |
| 147 | 147 |
| 148 // mojom::WindowTreeHost: | 148 // mojom::WindowTreeHost: |
| 149 void SetSize(mojo::SizePtr size) override; | 149 void SetSize(mojo::SizePtr size) override; |
| 150 void SetTitle(const mojo::String& title) override; | 150 void SetTitle(const mojo::String& title) override; |
| 151 | 151 |
| 152 void SetBounds(gfx::Rect bounds); | |
|
sky
2016/05/03 02:39:51
const gfx::Rect&, and move this around line 148 (g
rjkroege
2016/05/03 21:03:03
Removed.
| |
| 153 | |
| 152 private: | 154 private: |
| 153 friend class test::DisplayTestApi; | 155 friend class test::DisplayTestApi; |
| 154 | 156 |
| 155 using WindowManagerStateMap = | 157 using WindowManagerStateMap = |
| 156 std::map<UserId, std::unique_ptr<WindowManagerState>>; | 158 std::map<UserId, std::unique_ptr<WindowManagerState>>; |
| 157 | 159 |
| 158 // Inits the necessary state once the display is ready. | 160 // Inits the necessary state once the display is ready. |
| 159 void InitWindowManagersIfNecessary(); | 161 void InitWindowManagersIfNecessary(); |
| 160 | 162 |
| 161 // Creates the set of WindowManagerStates from the | 163 // Creates the set of WindowManagerStates from the |
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 220 | 222 |
| 221 cc::SurfaceId top_level_surface_id_; | 223 cc::SurfaceId top_level_surface_id_; |
| 222 | 224 |
| 223 DISALLOW_COPY_AND_ASSIGN(Display); | 225 DISALLOW_COPY_AND_ASSIGN(Display); |
| 224 }; | 226 }; |
| 225 | 227 |
| 226 } // namespace ws | 228 } // namespace ws |
| 227 } // namespace mus | 229 } // namespace mus |
| 228 | 230 |
| 229 #endif // COMPONENTS_MUS_WS_DISPLAY_H_ | 231 #endif // COMPONENTS_MUS_WS_DISPLAY_H_ |
| OLD | NEW |