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

Side by Side Diff: ash/mus/window_manager_application.h

Issue 2271373002: mash: Port mojo:ash_sysui's ContextMenuMus to mojo:ash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments Created 4 years, 3 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 | « ash/mus/shell_delegate_mus.cc ('k') | ash/mus/window_manager_application.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 #ifndef ASH_MUS_WINDOW_MANAGER_APPLICATION_H_ 5 #ifndef ASH_MUS_WINDOW_MANAGER_APPLICATION_H_
6 #define ASH_MUS_WINDOW_MANAGER_APPLICATION_H_ 6 #define ASH_MUS_WINDOW_MANAGER_APPLICATION_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory> 10 #include <memory>
(...skipping 16 matching lines...) Expand all
27 namespace ui { 27 namespace ui {
28 class Event; 28 class Event;
29 class GpuService; 29 class GpuService;
30 class WindowTreeClient; 30 class WindowTreeClient;
31 } 31 }
32 32
33 namespace ash { 33 namespace ash {
34 namespace mus { 34 namespace mus {
35 35
36 class AcceleratorRegistrarImpl; 36 class AcceleratorRegistrarImpl;
37 class NativeWidgetFactoryMus;
37 class WindowManager; 38 class WindowManager;
38 39
39 // Hosts the window manager and the ash system user interface for mash. 40 // Hosts the window manager and the ash system user interface for mash.
40 // TODO(mash): Port ash_sysui's ShelfController and WallpaperController here. 41 // TODO(mash): Port ash_sysui's ShelfController and WallpaperController here.
41 class WindowManagerApplication 42 class WindowManagerApplication
42 : public shell::Service, 43 : public shell::Service,
43 public shell::InterfaceFactory<ui::mojom::AcceleratorRegistrar>, 44 public shell::InterfaceFactory<ui::mojom::AcceleratorRegistrar>,
44 public mash::session::mojom::ScreenlockStateListener { 45 public mash::session::mojom::ScreenlockStateListener {
45 public: 46 public:
46 WindowManagerApplication(); 47 WindowManagerApplication();
(...skipping 20 matching lines...) Expand all
67 void Create( 68 void Create(
68 const shell::Identity& remote_identity, 69 const shell::Identity& remote_identity,
69 mojo::InterfaceRequest<ui::mojom::AcceleratorRegistrar> request) override; 70 mojo::InterfaceRequest<ui::mojom::AcceleratorRegistrar> request) override;
70 71
71 // session::mojom::ScreenlockStateListener: 72 // session::mojom::ScreenlockStateListener:
72 void ScreenlockStateChanged(bool locked) override; 73 void ScreenlockStateChanged(bool locked) override;
73 74
74 tracing::Provider tracing_; 75 tracing::Provider tracing_;
75 76
76 std::unique_ptr<views::AuraInit> aura_init_; 77 std::unique_ptr<views::AuraInit> aura_init_;
78 std::unique_ptr<NativeWidgetFactoryMus> native_widget_factory_mus_;
77 79
78 std::unique_ptr<ui::GpuService> gpu_service_; 80 std::unique_ptr<ui::GpuService> gpu_service_;
79 std::unique_ptr<views::SurfaceContextFactory> compositor_context_factory_; 81 std::unique_ptr<views::SurfaceContextFactory> compositor_context_factory_;
80 std::unique_ptr<WindowManager> window_manager_; 82 std::unique_ptr<WindowManager> window_manager_;
81 83
82 std::set<AcceleratorRegistrarImpl*> accelerator_registrars_; 84 std::set<AcceleratorRegistrarImpl*> accelerator_registrars_;
83 85
84 mash::session::mojom::SessionPtr session_; 86 mash::session::mojom::SessionPtr session_;
85 87
86 mojo::Binding<mash::session::mojom::ScreenlockStateListener> 88 mojo::Binding<mash::session::mojom::ScreenlockStateListener>
87 screenlock_state_listener_binding_; 89 screenlock_state_listener_binding_;
88 90
89 DISALLOW_COPY_AND_ASSIGN(WindowManagerApplication); 91 DISALLOW_COPY_AND_ASSIGN(WindowManagerApplication);
90 }; 92 };
91 93
92 } // namespace mus 94 } // namespace mus
93 } // namespace ash 95 } // namespace ash
94 96
95 #endif // ASH_MUS_WINDOW_MANAGER_APPLICATION_H_ 97 #endif // ASH_MUS_WINDOW_MANAGER_APPLICATION_H_
OLDNEW
« no previous file with comments | « ash/mus/shell_delegate_mus.cc ('k') | ash/mus/window_manager_application.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698