| 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 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 44 // the server, that is, no conversion is done before sending |properties| to | 44 // the server, that is, no conversion is done before sending |properties| to |
| 45 // the server. Additionally |properties| are passed to PropertyConverter and | 45 // the server. Additionally |properties| are passed to PropertyConverter and |
| 46 // any known properties are set on the Window created by this class. | 46 // any known properties are set on the Window created by this class. |
| 47 // TODO: this should take an unordered_map, see http://crbug.com/670515. | 47 // TODO: this should take an unordered_map, see http://crbug.com/670515. |
| 48 explicit WindowTreeHostMus( | 48 explicit WindowTreeHostMus( |
| 49 WindowTreeClient* window_tree_client, | 49 WindowTreeClient* window_tree_client, |
| 50 const std::map<std::string, std::vector<uint8_t>>* properties = nullptr); | 50 const std::map<std::string, std::vector<uint8_t>>* properties = nullptr); |
| 51 | 51 |
| 52 ~WindowTreeHostMus() override; | 52 ~WindowTreeHostMus() override; |
| 53 | 53 |
| 54 // Sets the bounds in dips. | 54 // Sets the bounds in pixels. |
| 55 void SetBoundsFromServer(const gfx::Rect& bounds); | 55 void SetBoundsFromServer(const gfx::Rect& bounds_in_pixels); |
| 56 | 56 |
| 57 ui::EventDispatchDetails SendEventToProcessor(ui::Event* event) { | 57 ui::EventDispatchDetails SendEventToProcessor(ui::Event* event) { |
| 58 return aura::WindowTreeHostPlatform::SendEventToProcessor(event); | 58 return aura::WindowTreeHostPlatform::SendEventToProcessor(event); |
| 59 } | 59 } |
| 60 | 60 |
| 61 InputMethodMus* input_method() { return input_method_.get(); } | 61 InputMethodMus* input_method() { return input_method_.get(); } |
| 62 | 62 |
| 63 // Sets the client area on the underlying mus window. | 63 // Sets the client area on the underlying mus window. |
| 64 void SetClientArea(const gfx::Insets& insets, | 64 void SetClientArea(const gfx::Insets& insets, |
| 65 const std::vector<gfx::Rect>& additional_client_area); | 65 const std::vector<gfx::Rect>& additional_client_area); |
| (...skipping 24 matching lines...) Expand all Loading... |
| 90 bool in_set_bounds_from_server_ = false; | 90 bool in_set_bounds_from_server_ = false; |
| 91 | 91 |
| 92 std::unique_ptr<InputMethodMus> input_method_; | 92 std::unique_ptr<InputMethodMus> input_method_; |
| 93 | 93 |
| 94 DISALLOW_COPY_AND_ASSIGN(WindowTreeHostMus); | 94 DISALLOW_COPY_AND_ASSIGN(WindowTreeHostMus); |
| 95 }; | 95 }; |
| 96 | 96 |
| 97 } // namespace aura | 97 } // namespace aura |
| 98 | 98 |
| 99 #endif // UI_AURA_MUS_WINDOW_TREE_HOST_MUS_H_ | 99 #endif // UI_AURA_MUS_WINDOW_TREE_HOST_MUS_H_ |
| OLD | NEW |