| 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 #include "ui/aura/mus/window_tree_host_mus.h" | 5 #include "ui/aura/mus/window_tree_host_mus.h" |
| 6 | 6 |
| 7 #include "base/memory/ptr_util.h" | 7 #include "base/memory/ptr_util.h" |
| 8 #include "ui/aura/env.h" | 8 #include "ui/aura/env.h" |
| 9 #include "ui/aura/mus/input_method_mus.h" | 9 #include "ui/aura/mus/input_method_mus.h" |
| 10 #include "ui/aura/mus/window_port_mus.h" | 10 #include "ui/aura/mus/window_port_mus.h" |
| (...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 115 const gfx::Insets& insets, | 115 const gfx::Insets& insets, |
| 116 const std::vector<gfx::Rect>& additional_client_area) { | 116 const std::vector<gfx::Rect>& additional_client_area) { |
| 117 delegate_->OnWindowTreeHostClientAreaWillChange(this, insets, | 117 delegate_->OnWindowTreeHostClientAreaWillChange(this, insets, |
| 118 additional_client_area); | 118 additional_client_area); |
| 119 } | 119 } |
| 120 | 120 |
| 121 void WindowTreeHostMus::SetHitTestMask(const base::Optional<gfx::Rect>& rect) { | 121 void WindowTreeHostMus::SetHitTestMask(const base::Optional<gfx::Rect>& rect) { |
| 122 delegate_->OnWindowTreeHostHitTestMaskWillChange(this, rect); | 122 delegate_->OnWindowTreeHostHitTestMaskWillChange(this, rect); |
| 123 } | 123 } |
| 124 | 124 |
| 125 void WindowTreeHostMus::DeactivateWindow() { |
| 126 delegate_->OnWindowTreeHostDeactivateWindow(this); |
| 127 } |
| 128 |
| 125 display::Display WindowTreeHostMus::GetDisplay() const { | 129 display::Display WindowTreeHostMus::GetDisplay() const { |
| 126 display::Display display; | 130 display::Display display; |
| 127 display::Screen::GetScreen()->GetDisplayWithDisplayId(display_id_, &display); | 131 display::Screen::GetScreen()->GetDisplayWithDisplayId(display_id_, &display); |
| 128 return display; | 132 return display; |
| 129 } | 133 } |
| 130 | 134 |
| 131 void WindowTreeHostMus::HideImpl() { | 135 void WindowTreeHostMus::HideImpl() { |
| 132 WindowTreeHostPlatform::HideImpl(); | 136 WindowTreeHostPlatform::HideImpl(); |
| 133 window()->Hide(); | 137 window()->Hide(); |
| 134 } | 138 } |
| (...skipping 23 matching lines...) Expand all Loading... |
| 158 void WindowTreeHostMus::OnCloseRequest() { | 162 void WindowTreeHostMus::OnCloseRequest() { |
| 159 OnHostCloseRequested(); | 163 OnHostCloseRequested(); |
| 160 } | 164 } |
| 161 | 165 |
| 162 gfx::ICCProfile WindowTreeHostMus::GetICCProfileForCurrentDisplay() { | 166 gfx::ICCProfile WindowTreeHostMus::GetICCProfileForCurrentDisplay() { |
| 163 // TODO: This should read the profile from mus. crbug.com/647510 | 167 // TODO: This should read the profile from mus. crbug.com/647510 |
| 164 return gfx::ICCProfile(); | 168 return gfx::ICCProfile(); |
| 165 } | 169 } |
| 166 | 170 |
| 167 } // namespace aura | 171 } // namespace aura |
| OLD | NEW |