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 UI_AURA_MUS_WINDOW_TREE_HOST_MUS_H_ | 5 #ifndef UI_AURA_MUS_WINDOW_TREE_HOST_MUS_H_ |
6 #define UI_AURA_MUS_WINDOW_TREE_HOST_MUS_H_ | 6 #define UI_AURA_MUS_WINDOW_TREE_HOST_MUS_H_ |
7 | 7 |
8 #include <stdint.h> | 8 #include <stdint.h> |
9 | 9 |
10 #include <map> | 10 #include <map> |
(...skipping 20 matching lines...) Expand all Loading... |
31 | 31 |
32 class AURA_EXPORT WindowTreeHostMus : public aura::WindowTreeHostPlatform { | 32 class AURA_EXPORT WindowTreeHostMus : public aura::WindowTreeHostPlatform { |
33 public: | 33 public: |
34 // |properties| are applied to the window created by this class (using | 34 // |properties| are applied to the window created by this class (using |
35 // PropertyConverter). | 35 // PropertyConverter). |
36 // TODO: this should take an unordered_map, see http://crbug.com/670515. | 36 // TODO: this should take an unordered_map, see http://crbug.com/670515. |
37 WindowTreeHostMus( | 37 WindowTreeHostMus( |
38 std::unique_ptr<WindowPortMus> window_port, | 38 std::unique_ptr<WindowPortMus> window_port, |
39 WindowTreeClient* window_tree_client, | 39 WindowTreeClient* window_tree_client, |
40 int64_t display_id, | 40 int64_t display_id, |
| 41 const cc::FrameSinkId& frame_sink_id = cc::FrameSinkId(), |
41 const std::map<std::string, std::vector<uint8_t>>* properties = nullptr); | 42 const std::map<std::string, std::vector<uint8_t>>* properties = nullptr); |
42 | 43 |
43 // This constructor is intended for creating top level windows in | 44 // This constructor is intended for creating top level windows in |
44 // non-window-manager code. |properties| are properties passed verbatim to | 45 // non-window-manager code. |properties| are properties passed verbatim to |
45 // the server, that is, no conversion is done before sending |properties| to | 46 // the server, that is, no conversion is done before sending |properties| to |
46 // the server. Additionally |properties| are passed to PropertyConverter and | 47 // the server. Additionally |properties| are passed to PropertyConverter and |
47 // any known properties are set on the Window created by this class. | 48 // any known properties are set on the Window created by this class. |
48 // TODO: this should take an unordered_map, see http://crbug.com/670515. | 49 // TODO: this should take an unordered_map, see http://crbug.com/670515. |
49 explicit WindowTreeHostMus( | 50 explicit WindowTreeHostMus( |
50 WindowTreeClient* window_tree_client, | 51 WindowTreeClient* window_tree_client, |
| 52 const cc::FrameSinkId& frame_sink_id = cc::FrameSinkId(), |
51 const std::map<std::string, std::vector<uint8_t>>* properties = nullptr); | 53 const std::map<std::string, std::vector<uint8_t>>* properties = nullptr); |
52 | 54 |
53 ~WindowTreeHostMus() override; | 55 ~WindowTreeHostMus() override; |
54 | 56 |
55 // Returns the WindowTreeHostMus for |window|. This returns null if |window| | 57 // Returns the WindowTreeHostMus for |window|. This returns null if |window| |
56 // is null, or not in a WindowTreeHostMus. | 58 // is null, or not in a WindowTreeHostMus. |
57 static WindowTreeHostMus* ForWindow(aura::Window* window); | 59 static WindowTreeHostMus* ForWindow(aura::Window* window); |
58 | 60 |
59 // Sets the bounds in pixels. | 61 // Sets the bounds in pixels. |
60 void SetBoundsFromServer(const gfx::Rect& bounds_in_pixels); | 62 void SetBoundsFromServer(const gfx::Rect& bounds_in_pixels); |
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
121 bool in_set_bounds_from_server_ = false; | 123 bool in_set_bounds_from_server_ = false; |
122 | 124 |
123 std::unique_ptr<InputMethodMus> input_method_; | 125 std::unique_ptr<InputMethodMus> input_method_; |
124 | 126 |
125 DISALLOW_COPY_AND_ASSIGN(WindowTreeHostMus); | 127 DISALLOW_COPY_AND_ASSIGN(WindowTreeHostMus); |
126 }; | 128 }; |
127 | 129 |
128 } // namespace aura | 130 } // namespace aura |
129 | 131 |
130 #endif // UI_AURA_MUS_WINDOW_TREE_HOST_MUS_H_ | 132 #endif // UI_AURA_MUS_WINDOW_TREE_HOST_MUS_H_ |
OLD | NEW |