| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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/views/mus/desktop_window_tree_host_mus.h" | 5 #include "ui/views/mus/desktop_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/client/aura_constants.h" | 8 #include "ui/aura/client/aura_constants.h" |
| 9 #include "ui/aura/client/drag_drop_client.h" | 9 #include "ui/aura/client/drag_drop_client.h" |
| 10 #include "ui/aura/client/focus_client.h" | 10 #include "ui/aura/client/focus_client.h" |
| (...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 124 bool DesktopWindowTreeHostMus::IsVisible() const { | 124 bool DesktopWindowTreeHostMus::IsVisible() const { |
| 125 return window()->IsVisible(); | 125 return window()->IsVisible(); |
| 126 } | 126 } |
| 127 | 127 |
| 128 void DesktopWindowTreeHostMus::SetSize(const gfx::Size& size) { | 128 void DesktopWindowTreeHostMus::SetSize(const gfx::Size& size) { |
| 129 // TODO: handle device scale, http://crbug.com/663524. | 129 // TODO: handle device scale, http://crbug.com/663524. |
| 130 SetBounds(gfx::Rect(window()->bounds().origin(), size)); | 130 SetBounds(gfx::Rect(window()->bounds().origin(), size)); |
| 131 } | 131 } |
| 132 | 132 |
| 133 void DesktopWindowTreeHostMus::StackAbove(aura::Window* window) { | 133 void DesktopWindowTreeHostMus::StackAbove(aura::Window* window) { |
| 134 // TODO: implement window stacking, http://crbug.com/663617. |
| 134 NOTIMPLEMENTED(); | 135 NOTIMPLEMENTED(); |
| 135 } | 136 } |
| 136 | 137 |
| 137 void DesktopWindowTreeHostMus::StackAtTop() { | 138 void DesktopWindowTreeHostMus::StackAtTop() { |
| 139 // TODO: implement window stacking, http://crbug.com/663617. |
| 138 NOTIMPLEMENTED(); | 140 NOTIMPLEMENTED(); |
| 139 } | 141 } |
| 140 | 142 |
| 141 void DesktopWindowTreeHostMus::CenterWindow(const gfx::Size& size) { | 143 void DesktopWindowTreeHostMus::CenterWindow(const gfx::Size& size) { |
| 142 NOTIMPLEMENTED(); | 144 NOTIMPLEMENTED(); |
| 143 } | 145 } |
| 144 | 146 |
| 145 void DesktopWindowTreeHostMus::GetWindowPlacement( | 147 void DesktopWindowTreeHostMus::GetWindowPlacement( |
| 146 gfx::Rect* bounds, | 148 gfx::Rect* bounds, |
| 147 ui::WindowShowState* show_state) const { | 149 ui::WindowShowState* show_state) const { |
| (...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 211 aura::client::GetFocusClient(window()), window()); | 213 aura::client::GetFocusClient(window()), window()); |
| 212 if (is_active_) { | 214 if (is_active_) { |
| 213 window()->Focus(); | 215 window()->Focus(); |
| 214 if (window()->GetProperty(aura::client::kDrawAttentionKey)) | 216 if (window()->GetProperty(aura::client::kDrawAttentionKey)) |
| 215 window()->SetProperty(aura::client::kDrawAttentionKey, false); | 217 window()->SetProperty(aura::client::kDrawAttentionKey, false); |
| 216 } | 218 } |
| 217 } | 219 } |
| 218 | 220 |
| 219 void DesktopWindowTreeHostMus::Deactivate() { | 221 void DesktopWindowTreeHostMus::Deactivate() { |
| 220 // TODO: Deactivate() means focus next window, that needs to go to mus. | 222 // TODO: Deactivate() means focus next window, that needs to go to mus. |
| 223 // http://crbug.com/663618. |
| 221 NOTIMPLEMENTED(); | 224 NOTIMPLEMENTED(); |
| 222 } | 225 } |
| 223 | 226 |
| 224 bool DesktopWindowTreeHostMus::IsActive() const { | 227 bool DesktopWindowTreeHostMus::IsActive() const { |
| 225 return is_active_; | 228 return is_active_; |
| 226 } | 229 } |
| 227 | 230 |
| 228 void DesktopWindowTreeHostMus::Maximize() { | 231 void DesktopWindowTreeHostMus::Maximize() { |
| 229 window()->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_MAXIMIZED); | 232 window()->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_MAXIMIZED); |
| 230 } | 233 } |
| (...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 321 aura::client::kShowStateKey, | 324 aura::client::kShowStateKey, |
| 322 fullscreen ? ui::SHOW_STATE_FULLSCREEN : fullscreen_restore_state_); | 325 fullscreen ? ui::SHOW_STATE_FULLSCREEN : fullscreen_restore_state_); |
| 323 } | 326 } |
| 324 | 327 |
| 325 bool DesktopWindowTreeHostMus::IsFullscreen() const { | 328 bool DesktopWindowTreeHostMus::IsFullscreen() const { |
| 326 return window()->GetProperty(aura::client::kShowStateKey) == | 329 return window()->GetProperty(aura::client::kShowStateKey) == |
| 327 ui::SHOW_STATE_FULLSCREEN; | 330 ui::SHOW_STATE_FULLSCREEN; |
| 328 } | 331 } |
| 329 void DesktopWindowTreeHostMus::SetOpacity(float opacity) { | 332 void DesktopWindowTreeHostMus::SetOpacity(float opacity) { |
| 330 // TODO: this likely need to go to server so that non-client decorations get | 333 // TODO: this likely need to go to server so that non-client decorations get |
| 331 // opacity. | 334 // opacity. http://crbug.com/663619. |
| 332 window()->layer()->SetOpacity(opacity); | 335 window()->layer()->SetOpacity(opacity); |
| 333 } | 336 } |
| 334 | 337 |
| 335 void DesktopWindowTreeHostMus::SetWindowIcons(const gfx::ImageSkia& window_icon, | 338 void DesktopWindowTreeHostMus::SetWindowIcons(const gfx::ImageSkia& window_icon, |
| 336 const gfx::ImageSkia& app_icon) { | 339 const gfx::ImageSkia& app_icon) { |
| 337 NativeWidgetAura::AssignIconToAuraWindow(window(), window_icon, app_icon); | 340 NativeWidgetAura::AssignIconToAuraWindow(window(), window_icon, app_icon); |
| 338 } | 341 } |
| 339 | 342 |
| 340 void DesktopWindowTreeHostMus::InitModalType(ui::ModalType modal_type) { | 343 void DesktopWindowTreeHostMus::InitModalType(ui::ModalType modal_type) { |
| 341 window()->SetProperty(aura::client::kModalKey, modal_type); | 344 window()->SetProperty(aura::client::kModalKey, modal_type); |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 401 if (window == this->window()) { | 404 if (window == this->window()) { |
| 402 is_active_ = true; | 405 is_active_ = true; |
| 403 desktop_native_widget_aura_->HandleActivationChanged(true); | 406 desktop_native_widget_aura_->HandleActivationChanged(true); |
| 404 } else if (is_active_) { | 407 } else if (is_active_) { |
| 405 is_active_ = false; | 408 is_active_ = false; |
| 406 desktop_native_widget_aura_->HandleActivationChanged(false); | 409 desktop_native_widget_aura_->HandleActivationChanged(false); |
| 407 } | 410 } |
| 408 } | 411 } |
| 409 | 412 |
| 410 } // namespace views | 413 } // namespace views |
| OLD | NEW |