| 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 "ash/mus/window_manager.h" | 5 #include "ash/mus/window_manager.h" |
| 6 | 6 |
| 7 #include <stdint.h> | 7 #include <stdint.h> |
| 8 | 8 |
| 9 #include <utility> | 9 #include <utility> |
| 10 | 10 |
| (...skipping 275 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 286 Shutdown(); | 286 Shutdown(); |
| 287 // TODO(sky): this case should trigger shutting down WindowManagerApplication | 287 // TODO(sky): this case should trigger shutting down WindowManagerApplication |
| 288 // too. | 288 // too. |
| 289 } | 289 } |
| 290 | 290 |
| 291 void WindowManager::OnPointerEventObserved(const ui::PointerEvent& event, | 291 void WindowManager::OnPointerEventObserved(const ui::PointerEvent& event, |
| 292 aura::Window* target) { | 292 aura::Window* target) { |
| 293 pointer_watcher_event_router_->OnPointerEventObserved(event, target); | 293 pointer_watcher_event_router_->OnPointerEventObserved(event, target); |
| 294 } | 294 } |
| 295 | 295 |
| 296 aura::client::CaptureClient* WindowManager::GetCaptureClient() { | |
| 297 return wm_state_->capture_controller(); | |
| 298 } | |
| 299 | |
| 300 aura::PropertyConverter* WindowManager::GetPropertyConverter() { | 296 aura::PropertyConverter* WindowManager::GetPropertyConverter() { |
| 301 return property_converter_.get(); | 297 return property_converter_.get(); |
| 302 } | 298 } |
| 303 | 299 |
| 304 void WindowManager::SetWindowManagerClient(aura::WindowManagerClient* client) { | 300 void WindowManager::SetWindowManagerClient(aura::WindowManagerClient* client) { |
| 305 window_manager_client_ = client; | 301 window_manager_client_ = client; |
| 306 ash::Shell::set_window_manager_client(client); | 302 ash::Shell::set_window_manager_client(client); |
| 307 } | 303 } |
| 308 | 304 |
| 309 bool WindowManager::OnWmSetBounds(aura::Window* window, gfx::Rect* bounds) { | 305 bool WindowManager::OnWmSetBounds(aura::Window* window, gfx::Rect* bounds) { |
| (...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 468 bool WindowManager::IsWindowActive(aura::Window* window) { | 464 bool WindowManager::IsWindowActive(aura::Window* window) { |
| 469 return Shell::GetInstance()->activation_client()->GetActiveWindow() == window; | 465 return Shell::GetInstance()->activation_client()->GetActiveWindow() == window; |
| 470 } | 466 } |
| 471 | 467 |
| 472 void WindowManager::OnWmDeactivateWindow(aura::Window* window) { | 468 void WindowManager::OnWmDeactivateWindow(aura::Window* window) { |
| 473 Shell::GetInstance()->activation_client()->DeactivateWindow(window); | 469 Shell::GetInstance()->activation_client()->DeactivateWindow(window); |
| 474 } | 470 } |
| 475 | 471 |
| 476 } // namespace mus | 472 } // namespace mus |
| 477 } // namespace ash | 473 } // namespace ash |
| OLD | NEW |