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

Side by Side Diff: services/ui/ws/display.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 | « services/ui/ws/default_access_policy.cc ('k') | services/ui/ws/event_dispatcher_unittest.cc » ('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 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 "services/ui/ws/display.h" 5 #include "services/ui/ws/display.h"
6 6
7 #include <set> 7 #include <set>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after
249 window_manager_state->AddWindowManagerDisplayRoot( 249 window_manager_state->AddWindowManagerDisplayRoot(
250 std::move(display_root_ptr)); 250 std::move(display_root_ptr));
251 } 251 }
252 252
253 void Display::CreateRootWindow(const gfx::Size& size) { 253 void Display::CreateRootWindow(const gfx::Size& size) {
254 DCHECK(!root_); 254 DCHECK(!root_);
255 255
256 root_.reset(window_server_->CreateServerWindow( 256 root_.reset(window_server_->CreateServerWindow(
257 display_manager()->GetAndAdvanceNextRootId(), 257 display_manager()->GetAndAdvanceNextRootId(),
258 ServerWindow::Properties())); 258 ServerWindow::Properties()));
259 root_->set_event_targeting_policy(
260 mojom::EventTargetingPolicy::DESCENDANTS_ONLY);
259 root_->SetBounds(gfx::Rect(size)); 261 root_->SetBounds(gfx::Rect(size));
260 root_->SetVisible(true); 262 root_->SetVisible(true);
261 focus_controller_ = base::MakeUnique<FocusController>(this, root_.get()); 263 focus_controller_ = base::MakeUnique<FocusController>(this, root_.get());
262 focus_controller_->AddObserver(this); 264 focus_controller_->AddObserver(this);
263 } 265 }
264 266
265 display::Display Display::GetDisplay() { 267 display::Display Display::GetDisplay() {
266 return ToDisplay(); 268 return ToDisplay();
267 } 269 }
268 270
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
391 } 393 }
392 394
393 void Display::OnWindowManagerWindowTreeFactoryReady( 395 void Display::OnWindowManagerWindowTreeFactoryReady(
394 WindowManagerWindowTreeFactory* factory) { 396 WindowManagerWindowTreeFactory* factory) {
395 if (!binding_) 397 if (!binding_)
396 CreateWindowManagerDisplayRootFromFactory(factory); 398 CreateWindowManagerDisplayRootFromFactory(factory);
397 } 399 }
398 400
399 } // namespace ws 401 } // namespace ws
400 } // namespace ui 402 } // namespace ui
OLDNEW
« no previous file with comments | « services/ui/ws/default_access_policy.cc ('k') | services/ui/ws/event_dispatcher_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698