Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(95)

Side by Side Diff: ash/mus/window_manager.cc

Issue 2657873006: Remove WindowTreeClientDelegate::GetCaptureClient() and WindowTreeClient::GetCaptureClient(). (Closed)
Patch Set: Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 262 matching lines...) Expand 10 before | Expand all | Expand 10 after
273 Shutdown(); 273 Shutdown();
274 // TODO(sky): this case should trigger shutting down WindowManagerApplication 274 // TODO(sky): this case should trigger shutting down WindowManagerApplication
275 // too. 275 // too.
276 } 276 }
277 277
278 void WindowManager::OnPointerEventObserved(const ui::PointerEvent& event, 278 void WindowManager::OnPointerEventObserved(const ui::PointerEvent& event,
279 aura::Window* target) { 279 aura::Window* target) {
280 pointer_watcher_event_router_->OnPointerEventObserved(event, target); 280 pointer_watcher_event_router_->OnPointerEventObserved(event, target);
281 } 281 }
282 282
283 aura::client::CaptureClient* WindowManager::GetCaptureClient() {
284 return wm_state_->capture_controller();
285 }
286
287 aura::PropertyConverter* WindowManager::GetPropertyConverter() { 283 aura::PropertyConverter* WindowManager::GetPropertyConverter() {
288 return property_converter_.get(); 284 return property_converter_.get();
289 } 285 }
290 286
291 void WindowManager::SetWindowManagerClient(aura::WindowManagerClient* client) { 287 void WindowManager::SetWindowManagerClient(aura::WindowManagerClient* client) {
292 window_manager_client_ = client; 288 window_manager_client_ = client;
293 ash::Shell::set_window_manager_client(client); 289 ash::Shell::set_window_manager_client(client);
294 } 290 }
295 291
296 bool WindowManager::OnWmSetBounds(aura::Window* window, gfx::Rect* bounds) { 292 bool WindowManager::OnWmSetBounds(aura::Window* window, gfx::Rect* bounds) {
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
448 bool WindowManager::IsWindowActive(aura::Window* window) { 444 bool WindowManager::IsWindowActive(aura::Window* window) {
449 return Shell::GetInstance()->activation_client()->GetActiveWindow() == window; 445 return Shell::GetInstance()->activation_client()->GetActiveWindow() == window;
450 } 446 }
451 447
452 void WindowManager::OnWmDeactivateWindow(aura::Window* window) { 448 void WindowManager::OnWmDeactivateWindow(aura::Window* window) {
453 Shell::GetInstance()->activation_client()->DeactivateWindow(window); 449 Shell::GetInstance()->activation_client()->DeactivateWindow(window);
454 } 450 }
455 451
456 } // namespace mus 452 } // namespace mus
457 } // namespace ash 453 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698