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

Side by Side Diff: services/ui/ws/display_manager.cc

Issue 2712963003: mustash: Use ui::chromeos::EventRewriter in mus (Closed)
Patch Set: Update tests Created 3 years, 9 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
« services/ui/ws/display.cc ('K') | « services/ui/ws/display_manager.h ('k') | no next file » | 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 "services/ui/ws/display_manager.h" 5 #include "services/ui/ws/display_manager.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/memory/ptr_util.h" 9 #include "base/memory/ptr_util.h"
10 #include "base/trace_event/trace_event.h" 10 #include "base/trace_event/trace_event.h"
11 #include "services/ui/display/viewport_metrics.h" 11 #include "services/ui/display/viewport_metrics.h"
12 #include "services/ui/ws/cursor_location_manager.h" 12 #include "services/ui/ws/cursor_location_manager.h"
13 #include "services/ui/ws/display.h" 13 #include "services/ui/ws/display.h"
14 #include "services/ui/ws/display_binding.h" 14 #include "services/ui/ws/display_binding.h"
15 #include "services/ui/ws/event_dispatcher.h" 15 #include "services/ui/ws/event_dispatcher.h"
16 #include "services/ui/ws/server_window.h" 16 #include "services/ui/ws/server_window.h"
17 #include "services/ui/ws/user_display_manager.h" 17 #include "services/ui/ws/user_display_manager.h"
18 #include "services/ui/ws/user_display_manager_delegate.h" 18 #include "services/ui/ws/user_display_manager_delegate.h"
19 #include "services/ui/ws/user_id_tracker.h" 19 #include "services/ui/ws/user_id_tracker.h"
20 #include "services/ui/ws/window_manager_state.h" 20 #include "services/ui/ws/window_manager_state.h"
21 #include "services/ui/ws/window_manager_window_tree_factory.h" 21 #include "services/ui/ws/window_manager_window_tree_factory.h"
22 #include "services/ui/ws/window_server_delegate.h" 22 #include "services/ui/ws/window_server_delegate.h"
23 #include "services/ui/ws/window_tree.h" 23 #include "services/ui/ws/window_tree.h"
24 24
25 #if defined(OS_CHROMEOS)
26 #include "ui/chromeos/events/event_rewriter.h"
27 #endif
28
25 namespace ui { 29 namespace ui {
26 namespace ws { 30 namespace ws {
27 31
28 DisplayManager::DisplayManager(WindowServer* window_server, 32 DisplayManager::DisplayManager(WindowServer* window_server,
29 UserIdTracker* user_id_tracker) 33 UserIdTracker* user_id_tracker)
30 // |next_root_id_| is used as the lower bits, so that starting at 0 is 34 // |next_root_id_| is used as the lower bits, so that starting at 0 is
31 // fine. |next_display_id_| is used by itself, so we start at 1 to reserve 35 // fine. |next_display_id_| is used by itself, so we start at 1 to reserve
32 // 0 as invalid. 36 // 0 as invalid.
33 : window_server_(window_server), 37 : window_server_(window_server),
34 user_id_tracker_(user_id_tracker), 38 user_id_tracker_(user_id_tracker),
35 next_root_id_(0) { 39 next_root_id_(0) {
40 #if defined(OS_CHROMEOS)
41 // TODO: http://crbug.com/701468 fix function key preferences and sticky keys.
42 ui::chromeos::EventRewriter::Delegate* delegate = nullptr;
43 ui::EventRewriter* sticky_keys_controller = nullptr;
44 event_rewriter_ = base::MakeUnique<ui::chromeos::EventRewriter>(
45 delegate, sticky_keys_controller);
46 #endif
36 user_id_tracker_->AddObserver(this); 47 user_id_tracker_->AddObserver(this);
37 } 48 }
38 49
39 DisplayManager::~DisplayManager() { 50 DisplayManager::~DisplayManager() {
40 user_id_tracker_->RemoveObserver(this); 51 user_id_tracker_->RemoveObserver(this);
41 DestroyAllDisplays(); 52 DestroyAllDisplays();
42 } 53 }
43 54
44 UserDisplayManager* DisplayManager::GetUserDisplayManager( 55 UserDisplayManager* DisplayManager::GetUserDisplayManager(
45 const UserId& user_id) { 56 const UserId& user_id) {
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after
227 DVLOG(3) << "OnPrimaryDisplayChanged: " << primary_display_id; 238 DVLOG(3) << "OnPrimaryDisplayChanged: " << primary_display_id;
228 // TODO(kylechar): Send IPCs to WM clients first. 239 // TODO(kylechar): Send IPCs to WM clients first.
229 240
230 // Send IPCs to any DisplayManagerObservers. 241 // Send IPCs to any DisplayManagerObservers.
231 for (const auto& pair : user_display_managers_) 242 for (const auto& pair : user_display_managers_)
232 pair.second->OnPrimaryDisplayChanged(primary_display_id); 243 pair.second->OnPrimaryDisplayChanged(primary_display_id);
233 } 244 }
234 245
235 } // namespace ws 246 } // namespace ws
236 } // namespace ui 247 } // namespace ui
OLDNEW
« services/ui/ws/display.cc ('K') | « services/ui/ws/display_manager.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698