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

Side by Side Diff: ash/mus/window_manager.cc

Issue 2227643003: Converts mash to use the common non-client frame (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@native_widget_mus_fix
Patch Set: feedback Created 4 years, 4 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
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 "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
11 #include "ash/common/shell_window_ids.h" 11 #include "ash/common/shell_window_ids.h"
12 #include "ash/mus/accelerators/accelerator_handler.h" 12 #include "ash/mus/accelerators/accelerator_handler.h"
13 #include "ash/mus/accelerators/accelerator_ids.h" 13 #include "ash/mus/accelerators/accelerator_ids.h"
14 #include "ash/mus/bridge/wm_lookup_mus.h" 14 #include "ash/mus/bridge/wm_lookup_mus.h"
15 #include "ash/mus/bridge/wm_shell_mus.h" 15 #include "ash/mus/bridge/wm_shell_mus.h"
16 #include "ash/mus/bridge/wm_window_mus.h" 16 #include "ash/mus/bridge/wm_window_mus.h"
17 #include "ash/mus/frame/move_event_handler.h" 17 #include "ash/mus/move_event_handler.h"
18 #include "ash/mus/non_client_frame_controller.h" 18 #include "ash/mus/non_client_frame_controller.h"
19 #include "ash/mus/property_util.h" 19 #include "ash/mus/property_util.h"
20 #include "ash/mus/root_window_controller.h" 20 #include "ash/mus/root_window_controller.h"
21 #include "ash/mus/shadow_controller.h" 21 #include "ash/mus/shadow_controller.h"
22 #include "ash/mus/shell_delegate_mus.h" 22 #include "ash/mus/shell_delegate_mus.h"
23 #include "ash/mus/window_manager_observer.h" 23 #include "ash/mus/window_manager_observer.h"
24 #include "ash/public/interfaces/container.mojom.h" 24 #include "ash/public/interfaces/container.mojom.h"
25 #include "services/ui/common/event_matcher_util.h" 25 #include "services/ui/common/event_matcher_util.h"
26 #include "services/ui/common/types.h" 26 #include "services/ui/common/types.h"
27 #include "services/ui/public/cpp/property_type_converters.h" 27 #include "services/ui/public/cpp/property_type_converters.h"
(...skipping 270 matching lines...) Expand 10 before | Expand all | Expand 10 after
298 const ui::Event& event) { 298 const ui::Event& event) {
299 auto iter = accelerator_handlers_.find(GetAcceleratorNamespaceId(id)); 299 auto iter = accelerator_handlers_.find(GetAcceleratorNamespaceId(id));
300 if (iter == accelerator_handlers_.end()) 300 if (iter == accelerator_handlers_.end())
301 return ui::mojom::EventResult::HANDLED; 301 return ui::mojom::EventResult::HANDLED;
302 302
303 return iter->second->OnAccelerator(id, event); 303 return iter->second->OnAccelerator(id, event);
304 } 304 }
305 305
306 } // namespace mus 306 } // namespace mus
307 } // namespace ash 307 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698