| 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 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 54 // Sets the bounds in dips. | 54 // Sets the bounds in dips. |
| 55 void SetBoundsFromServer(const gfx::Rect& bounds); | 55 void SetBoundsFromServer(const gfx::Rect& bounds); |
| 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 | 66 |
| 66 // Sets the hit test mask on the underlying mus window. Pass base::nullopt to | 67 // Sets the hit test mask on the underlying mus window. Pass base::nullopt to |
| 67 // clear. | 68 // clear. |
| 68 void SetHitTestMask(const base::Optional<gfx::Rect>& rect); | 69 void SetHitTestMask(const base::Optional<gfx::Rect>& rect); |
| 69 | 70 |
| 70 // Intended only for WindowTreeClient to call. | 71 // Intended only for WindowTreeClient to call. |
| 71 void set_display_id(int64_t id) { display_id_ = id; } | 72 void set_display_id(int64_t id) { display_id_ = id; } |
| 72 int64_t display_id() const { return display_id_; } | 73 int64_t display_id() const { return display_id_; } |
| 73 display::Display GetDisplay() const; | 74 display::Display GetDisplay() const; |
| 74 | 75 |
| (...skipping 14 matching lines...) Expand all Loading... |
| 89 bool in_set_bounds_from_server_ = false; | 90 bool in_set_bounds_from_server_ = false; |
| 90 | 91 |
| 91 std::unique_ptr<InputMethodMus> input_method_; | 92 std::unique_ptr<InputMethodMus> input_method_; |
| 92 | 93 |
| 93 DISALLOW_COPY_AND_ASSIGN(WindowTreeHostMus); | 94 DISALLOW_COPY_AND_ASSIGN(WindowTreeHostMus); |
| 94 }; | 95 }; |
| 95 | 96 |
| 96 } // namespace aura | 97 } // namespace aura |
| 97 | 98 |
| 98 #endif // UI_AURA_MUS_WINDOW_TREE_HOST_MUS_H_ | 99 #endif // UI_AURA_MUS_WINDOW_TREE_HOST_MUS_H_ |
| OLD | NEW |