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

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

Issue 2669203002: Revert: 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
« no previous file with comments | « mash/simple_wm/simple_wm.h ('k') | services/navigation/view_impl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
402 aura::PropertyConverter* SimpleWM::GetPropertyConverter() { 406 aura::PropertyConverter* SimpleWM::GetPropertyConverter() {
403 return &property_converter_; 407 return &property_converter_;
404 } 408 }
405 409
406 //////////////////////////////////////////////////////////////////////////////// 410 ////////////////////////////////////////////////////////////////////////////////
407 // SimpleWM, aura::WindowManagerDelegate implementation: 411 // SimpleWM, aura::WindowManagerDelegate implementation:
408 412
409 void SimpleWM::SetWindowManagerClient( 413 void SimpleWM::SetWindowManagerClient(
410 aura::WindowManagerClient* client) { 414 aura::WindowManagerClient* client) {
411 window_manager_client_ = client; 415 window_manager_client_ = client;
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after
576 } 580 }
577 581
578 void SimpleWM::OnWindowListViewItemActivated(aura::Window* window) { 582 void SimpleWM::OnWindowListViewItemActivated(aura::Window* window) {
579 window->Show(); 583 window->Show();
580 aura::client::ActivationClient* activation_client = 584 aura::client::ActivationClient* activation_client =
581 aura::client::GetActivationClient(window->GetRootWindow()); 585 aura::client::GetActivationClient(window->GetRootWindow());
582 activation_client->ActivateWindow(window); 586 activation_client->ActivateWindow(window);
583 } 587 }
584 588
585 } // namespace simple_wm 589 } // namespace simple_wm
OLDNEW
« no previous file with comments | « mash/simple_wm/simple_wm.h ('k') | services/navigation/view_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698