| 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 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 142 } | 142 } |
| 143 | 143 |
| 144 void WindowTreeHostMus::SetHitTestMask(const base::Optional<gfx::Rect>& rect) { | 144 void WindowTreeHostMus::SetHitTestMask(const base::Optional<gfx::Rect>& rect) { |
| 145 delegate_->OnWindowTreeHostHitTestMaskWillChange(this, rect); | 145 delegate_->OnWindowTreeHostHitTestMaskWillChange(this, rect); |
| 146 } | 146 } |
| 147 | 147 |
| 148 void WindowTreeHostMus::DeactivateWindow() { | 148 void WindowTreeHostMus::DeactivateWindow() { |
| 149 delegate_->OnWindowTreeHostDeactivateWindow(this); | 149 delegate_->OnWindowTreeHostDeactivateWindow(this); |
| 150 } | 150 } |
| 151 | 151 |
| 152 void WindowTreeHostMus::StackAbove(Window* window) { |
| 153 delegate_->OnWindowTreeHostStackAbove(this, window); |
| 154 } |
| 155 |
| 152 void WindowTreeHostMus::StackAtTop() { | 156 void WindowTreeHostMus::StackAtTop() { |
| 153 delegate_->OnWindowTreeHostStackAtTop(this); | 157 delegate_->OnWindowTreeHostStackAtTop(this); |
| 154 } | 158 } |
| 155 | 159 |
| 156 display::Display WindowTreeHostMus::GetDisplay() const { | 160 display::Display WindowTreeHostMus::GetDisplay() const { |
| 157 display::Display display; | 161 display::Display display; |
| 158 display::Screen::GetScreen()->GetDisplayWithDisplayId(display_id_, &display); | 162 display::Screen::GetScreen()->GetDisplayWithDisplayId(display_id_, &display); |
| 159 return display; | 163 return display; |
| 160 } | 164 } |
| 161 | 165 |
| (...skipping 27 matching lines...) Expand all Loading... |
| 189 void WindowTreeHostMus::OnCloseRequest() { | 193 void WindowTreeHostMus::OnCloseRequest() { |
| 190 OnHostCloseRequested(); | 194 OnHostCloseRequested(); |
| 191 } | 195 } |
| 192 | 196 |
| 193 gfx::ICCProfile WindowTreeHostMus::GetICCProfileForCurrentDisplay() { | 197 gfx::ICCProfile WindowTreeHostMus::GetICCProfileForCurrentDisplay() { |
| 194 // TODO: This should read the profile from mus. crbug.com/647510 | 198 // TODO: This should read the profile from mus. crbug.com/647510 |
| 195 return gfx::ICCProfile(); | 199 return gfx::ICCProfile(); |
| 196 } | 200 } |
| 197 | 201 |
| 198 } // namespace aura | 202 } // namespace aura |
| OLD | NEW |