OLD | NEW |
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 "ash/mus/window_manager.h" | 5 #include "ash/mus/window_manager.h" |
6 | 6 |
7 #include <stdint.h> | 7 #include <stdint.h> |
8 | 8 |
9 #include <utility> | 9 #include <utility> |
10 | 10 |
(...skipping 24 matching lines...) Expand all Loading... |
35 #include "services/ui/public/interfaces/window_manager.mojom.h" | 35 #include "services/ui/public/interfaces/window_manager.mojom.h" |
36 #include "ui/base/hit_test.h" | 36 #include "ui/base/hit_test.h" |
37 #include "ui/display/display_observer.h" | 37 #include "ui/display/display_observer.h" |
38 #include "ui/events/mojo/event.mojom.h" | 38 #include "ui/events/mojo/event.mojom.h" |
39 #include "ui/views/mus/pointer_watcher_event_router.h" | 39 #include "ui/views/mus/pointer_watcher_event_router.h" |
40 #include "ui/views/mus/screen_mus.h" | 40 #include "ui/views/mus/screen_mus.h" |
41 | 41 |
42 namespace ash { | 42 namespace ash { |
43 namespace mus { | 43 namespace mus { |
44 | 44 |
45 WindowManager::WindowManager(shell::Connector* connector) | 45 WindowManager::WindowManager(service_manager::Connector* connector) |
46 : connector_(connector) {} | 46 : connector_(connector) {} |
47 | 47 |
48 WindowManager::~WindowManager() { | 48 WindowManager::~WindowManager() { |
49 Shutdown(); | 49 Shutdown(); |
50 } | 50 } |
51 | 51 |
52 void WindowManager::Init( | 52 void WindowManager::Init( |
53 std::unique_ptr<ui::WindowTreeClient> window_tree_client, | 53 std::unique_ptr<ui::WindowTreeClient> window_tree_client, |
54 const scoped_refptr<base::SequencedWorkerPool>& blocking_pool) { | 54 const scoped_refptr<base::SequencedWorkerPool>& blocking_pool) { |
55 DCHECK(!window_tree_client_); | 55 DCHECK(!window_tree_client_); |
(...skipping 310 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
366 const ui::Event& event) { | 366 const ui::Event& event) { |
367 auto iter = accelerator_handlers_.find(GetAcceleratorNamespaceId(id)); | 367 auto iter = accelerator_handlers_.find(GetAcceleratorNamespaceId(id)); |
368 if (iter == accelerator_handlers_.end()) | 368 if (iter == accelerator_handlers_.end()) |
369 return ui::mojom::EventResult::HANDLED; | 369 return ui::mojom::EventResult::HANDLED; |
370 | 370 |
371 return iter->second->OnAccelerator(id, event); | 371 return iter->second->OnAccelerator(id, event); |
372 } | 372 } |
373 | 373 |
374 } // namespace mus | 374 } // namespace mus |
375 } // namespace ash | 375 } // namespace ash |
OLD | NEW |