| OLD | NEW |
| 1 // Copyright 2017 The Chromium Authors. All rights reserved. | 1 // Copyright 2017 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_INIT_PARAMS_H_ | 5 #ifndef UI_AURA_MUS_WINDOW_TREE_HOST_MUS_INIT_PARAMS_H_ |
| 6 #define UI_AURA_MUS_WINDOW_TREE_HOST_MUS_INIT_PARAMS_H_ | 6 #define UI_AURA_MUS_WINDOW_TREE_HOST_MUS_INIT_PARAMS_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <map> | 10 #include <map> |
| (...skipping 22 matching lines...) Expand all Loading... |
| 33 // Used to create the Window; must be specified. | 33 // Used to create the Window; must be specified. |
| 34 std::unique_ptr<WindowPortMus> window_port; | 34 std::unique_ptr<WindowPortMus> window_port; |
| 35 | 35 |
| 36 // Properties to send to the server as well as to set on the Window. | 36 // Properties to send to the server as well as to set on the Window. |
| 37 std::map<std::string, std::vector<uint8_t>> properties; | 37 std::map<std::string, std::vector<uint8_t>> properties; |
| 38 | 38 |
| 39 cc::FrameSinkId frame_sink_id; | 39 cc::FrameSinkId frame_sink_id; |
| 40 | 40 |
| 41 // Id of the display the window should be created on. | 41 // Id of the display the window should be created on. |
| 42 int64_t display_id = 0; | 42 int64_t display_id = 0; |
| 43 |
| 44 // Use classic IME instead of servicified IME. |
| 45 bool use_classic_ime = false; |
| 43 }; | 46 }; |
| 44 | 47 |
| 45 // Creates a WindowTreeHostMusInitParams that is used when creating a top-level | 48 // Creates a WindowTreeHostMusInitParams that is used when creating a top-level |
| 46 // window. | 49 // window. |
| 47 AURA_EXPORT WindowTreeHostMusInitParams CreateInitParamsForTopLevel( | 50 AURA_EXPORT WindowTreeHostMusInitParams CreateInitParamsForTopLevel( |
| 48 WindowTreeClient* window_tree_client, | 51 WindowTreeClient* window_tree_client, |
| 49 std::map<std::string, std::vector<uint8_t>> properties = | 52 std::map<std::string, std::vector<uint8_t>> properties = |
| 50 std::map<std::string, std::vector<uint8_t>>()); | 53 std::map<std::string, std::vector<uint8_t>>()); |
| 51 | 54 |
| 52 } // namespace aura | 55 } // namespace aura |
| 53 | 56 |
| 54 #endif // UI_AURA_MUS_WINDOW_TREE_HOST_MUS_INIT_PARAMS_H_ | 57 #endif // UI_AURA_MUS_WINDOW_TREE_HOST_MUS_INIT_PARAMS_H_ |
| OLD | NEW |