| 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 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 58 std::map<std::string, std::vector<uint8_t>> properties; | 58 std::map<std::string, std::vector<uint8_t>> properties; |
| 59 | 59 |
| 60 cc::FrameSinkId frame_sink_id; | 60 cc::FrameSinkId frame_sink_id; |
| 61 | 61 |
| 62 // Id of the display the window should be created on. | 62 // Id of the display the window should be created on. |
| 63 int64_t display_id = 0; | 63 int64_t display_id = 0; |
| 64 | 64 |
| 65 // Used when the WindowTreeHostMus corresponds to a new display manually | 65 // Used when the WindowTreeHostMus corresponds to a new display manually |
| 66 // created by the window manager. | 66 // created by the window manager. |
| 67 std::unique_ptr<DisplayInitParams> display_init_params; | 67 std::unique_ptr<DisplayInitParams> display_init_params; |
| 68 |
| 69 // Use classic IME instead of servicified IME. |
| 70 bool use_classic_ime = false; |
| 68 }; | 71 }; |
| 69 | 72 |
| 70 // Creates a WindowTreeHostMusInitParams that is used when creating a top-level | 73 // Creates a WindowTreeHostMusInitParams that is used when creating a top-level |
| 71 // window. | 74 // window. |
| 72 AURA_EXPORT WindowTreeHostMusInitParams CreateInitParamsForTopLevel( | 75 AURA_EXPORT WindowTreeHostMusInitParams CreateInitParamsForTopLevel( |
| 73 WindowTreeClient* window_tree_client, | 76 WindowTreeClient* window_tree_client, |
| 74 std::map<std::string, std::vector<uint8_t>> properties = | 77 std::map<std::string, std::vector<uint8_t>> properties = |
| 75 std::map<std::string, std::vector<uint8_t>>()); | 78 std::map<std::string, std::vector<uint8_t>>()); |
| 76 | 79 |
| 77 } // namespace aura | 80 } // namespace aura |
| 78 | 81 |
| 79 #endif // UI_AURA_MUS_WINDOW_TREE_HOST_MUS_INIT_PARAMS_H_ | 82 #endif // UI_AURA_MUS_WINDOW_TREE_HOST_MUS_INIT_PARAMS_H_ |
| OLD | NEW |