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

Side by Side Diff: mash/simple_wm/simple_wm.cc

Issue 2657873006: Remove WindowTreeClientDelegate::GetCaptureClient() and WindowTreeClient::GetCaptureClient(). (Closed)
Patch Set: Created 3 years, 10 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 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 "mash/simple_wm/simple_wm.h" 5 #include "mash/simple_wm/simple_wm.h"
6 6
7 #include "base/observer_list.h" 7 #include "base/observer_list.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "mash/simple_wm/move_event_handler.h" 9 #include "mash/simple_wm/move_event_handler.h"
10 #include "ui/aura/client/aura_constants.h" 10 #include "ui/aura/client/aura_constants.h"
(...skipping 381 matching lines...) Expand 10 before | Expand all | Expand 10 after
392 // WindowTreeClients configured as the window manager should never get 392 // WindowTreeClients configured as the window manager should never get
393 // OnEmbedRootDestroyed(). 393 // OnEmbedRootDestroyed().
394 NOTREACHED(); 394 NOTREACHED();
395 } 395 }
396 396
397 void SimpleWM::OnPointerEventObserved(const ui::PointerEvent& event, 397 void SimpleWM::OnPointerEventObserved(const ui::PointerEvent& event,
398 aura::Window* target) { 398 aura::Window* target) {
399 // Don't care. 399 // Don't care.
400 } 400 }
401 401
402 aura::client::CaptureClient* SimpleWM::GetCaptureClient() {
403 return wm_state_.capture_controller();
404 }
405
406 aura::PropertyConverter* SimpleWM::GetPropertyConverter() { 402 aura::PropertyConverter* SimpleWM::GetPropertyConverter() {
407 return &property_converter_; 403 return &property_converter_;
408 } 404 }
409 405
410 //////////////////////////////////////////////////////////////////////////////// 406 ////////////////////////////////////////////////////////////////////////////////
411 // SimpleWM, aura::WindowManagerDelegate implementation: 407 // SimpleWM, aura::WindowManagerDelegate implementation:
412 408
413 void SimpleWM::SetWindowManagerClient( 409 void SimpleWM::SetWindowManagerClient(
414 aura::WindowManagerClient* client) { 410 aura::WindowManagerClient* client) {
415 window_manager_client_ = client; 411 window_manager_client_ = client;
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after
578 } 574 }
579 575
580 void SimpleWM::OnWindowListViewItemActivated(aura::Window* window) { 576 void SimpleWM::OnWindowListViewItemActivated(aura::Window* window) {
581 window->Show(); 577 window->Show();
582 aura::client::ActivationClient* activation_client = 578 aura::client::ActivationClient* activation_client =
583 aura::client::GetActivationClient(window->GetRootWindow()); 579 aura::client::GetActivationClient(window->GetRootWindow());
584 activation_client->ActivateWindow(window); 580 activation_client->ActivateWindow(window);
585 } 581 }
586 582
587 } // namespace simple_wm 583 } // namespace simple_wm
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698