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

Side by Side Diff: ui/aura/mus/window_tree_client.cc

Issue 2667073002: mash: changes can_accept_events to an enum (Closed)
Patch Set: merge 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 | « ui/aura/mus/window_tree_client.h ('k') | ui/aura/test/mus/test_window_tree.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/aura/mus/window_tree_client.h" 5 #include "ui/aura/mus/window_tree_client.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
(...skipping 809 matching lines...) Expand 10 before | Expand all | Expand 10 after
820 void WindowTreeClient::RemoveTestObserver( 820 void WindowTreeClient::RemoveTestObserver(
821 WindowTreeClientTestObserver* observer) { 821 WindowTreeClientTestObserver* observer) {
822 test_observers_.RemoveObserver(observer); 822 test_observers_.RemoveObserver(observer);
823 } 823 }
824 824
825 void WindowTreeClient::SetCanAcceptDrops(Id window_id, bool can_accept_drops) { 825 void WindowTreeClient::SetCanAcceptDrops(Id window_id, bool can_accept_drops) {
826 DCHECK(tree_); 826 DCHECK(tree_);
827 tree_->SetCanAcceptDrops(window_id, can_accept_drops); 827 tree_->SetCanAcceptDrops(window_id, can_accept_drops);
828 } 828 }
829 829
830 void WindowTreeClient::SetCanAcceptEvents(WindowMus* window, 830 void WindowTreeClient::SetEventTargetingPolicy(
831 bool can_accept_events) { 831 WindowMus* window,
832 ui::mojom::EventTargetingPolicy policy) {
832 DCHECK(tree_); 833 DCHECK(tree_);
833 tree_->SetCanAcceptEvents(window->server_id(), can_accept_events); 834 tree_->SetEventTargetingPolicy(window->server_id(), policy);
834 } 835 }
835 836
836 void WindowTreeClient::OnEmbed(ClientSpecificId client_id, 837 void WindowTreeClient::OnEmbed(ClientSpecificId client_id,
837 ui::mojom::WindowDataPtr root_data, 838 ui::mojom::WindowDataPtr root_data,
838 ui::mojom::WindowTreePtr tree, 839 ui::mojom::WindowTreePtr tree,
839 int64_t display_id, 840 int64_t display_id,
840 Id focused_window_id, 841 Id focused_window_id,
841 bool drawn) { 842 bool drawn) {
842 DCHECK(!tree_ptr_); 843 DCHECK(!tree_ptr_);
843 tree_ptr_ = std::move(tree); 844 tree_ptr_ = std::move(tree);
(...skipping 977 matching lines...) Expand 10 before | Expand all | Expand 10 after
1821 return ScheduleInFlightChange(base::MakeUnique<InFlightCaptureChange>( 1822 return ScheduleInFlightChange(base::MakeUnique<InFlightCaptureChange>(
1822 this, capture_synchronizer_.get(), window)); 1823 this, capture_synchronizer_.get(), window));
1823 } 1824 }
1824 1825
1825 uint32_t WindowTreeClient::CreateChangeIdForFocus(WindowMus* window) { 1826 uint32_t WindowTreeClient::CreateChangeIdForFocus(WindowMus* window) {
1826 return ScheduleInFlightChange(base::MakeUnique<InFlightFocusChange>( 1827 return ScheduleInFlightChange(base::MakeUnique<InFlightFocusChange>(
1827 this, focus_synchronizer_.get(), window)); 1828 this, focus_synchronizer_.get(), window));
1828 } 1829 }
1829 1830
1830 } // namespace aura 1831 } // namespace aura
OLDNEW
« no previous file with comments | « ui/aura/mus/window_tree_client.h ('k') | ui/aura/test/mus/test_window_tree.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698