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

Side by Side Diff: mash/wm/window_manager_application.h

Issue 1814533002: Use ui::Event instead of mojom::EventPtr in mash/wm. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@remove_eventptr
Patch Set: Created 4 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
« no previous file with comments | « mash/wm/window_manager.cc ('k') | mash/wm/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 MASH_WM_WINDOW_MANAGER_APPLICATION_H_ 5 #ifndef MASH_WM_WINDOW_MANAGER_APPLICATION_H_
6 #define MASH_WM_WINDOW_MANAGER_APPLICATION_H_ 6 #define MASH_WM_WINDOW_MANAGER_APPLICATION_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <set> 10 #include <set>
(...skipping 16 matching lines...) Expand all
27 namespace ui { 27 namespace ui {
28 namespace mojo { 28 namespace mojo {
29 class UIInit; 29 class UIInit;
30 } 30 }
31 } 31 }
32 32
33 namespace views { 33 namespace views {
34 class AuraInit; 34 class AuraInit;
35 } 35 }
36 36
37 namespace ui {
38 class Event;
39 }
40
37 namespace mash { 41 namespace mash {
38 namespace wm { 42 namespace wm {
39 43
40 class AcceleratorRegistrarImpl; 44 class AcceleratorRegistrarImpl;
41 class RootWindowController; 45 class RootWindowController;
42 class RootWindowsObserver; 46 class RootWindowsObserver;
43 class UserWindowControllerImpl; 47 class UserWindowControllerImpl;
44 48
45 class WindowManagerApplication 49 class WindowManagerApplication
46 : public mojo::ShellClient, 50 : public mojo::ShellClient,
(...skipping 16 matching lines...) Expand all
63 void OnRootWindowControllerGotRoot(RootWindowController* root_controller); 67 void OnRootWindowControllerGotRoot(RootWindowController* root_controller);
64 68
65 // Called after RootWindowController creates the necessary resources. 69 // Called after RootWindowController creates the necessary resources.
66 void OnRootWindowControllerDoneInit(RootWindowController* root_controller); 70 void OnRootWindowControllerDoneInit(RootWindowController* root_controller);
67 71
68 // Called when the root mus::Window of RootWindowController is destroyed. 72 // Called when the root mus::Window of RootWindowController is destroyed.
69 // |root_controller| is destroyed after this call. 73 // |root_controller| is destroyed after this call.
70 void OnRootWindowDestroyed(RootWindowController* root_controller); 74 void OnRootWindowDestroyed(RootWindowController* root_controller);
71 75
72 // TODO(sky): figure out right place for this code. 76 // TODO(sky): figure out right place for this code.
73 void OnAccelerator(uint32_t id, mus::mojom::EventPtr event); 77 void OnAccelerator(uint32_t id, const ui::Event& event);
74 78
75 void AddRootWindowsObserver(RootWindowsObserver* observer); 79 void AddRootWindowsObserver(RootWindowsObserver* observer);
76 void RemoveRootWindowsObserver(RootWindowsObserver* observer); 80 void RemoveRootWindowsObserver(RootWindowsObserver* observer);
77 81
78 mash::shell::mojom::Shell* mash_shell() { 82 mash::shell::mojom::Shell* mash_shell() {
79 return mash_shell_.get(); 83 return mash_shell_.get();
80 } 84 }
81 85
82 private: 86 private:
83 void OnAcceleratorRegistrarDestroyed(AcceleratorRegistrarImpl* registrar); 87 void OnAcceleratorRegistrarDestroyed(AcceleratorRegistrarImpl* registrar);
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 133
130 base::ObserverList<RootWindowsObserver> root_windows_observers_; 134 base::ObserverList<RootWindowsObserver> root_windows_observers_;
131 135
132 DISALLOW_COPY_AND_ASSIGN(WindowManagerApplication); 136 DISALLOW_COPY_AND_ASSIGN(WindowManagerApplication);
133 }; 137 };
134 138
135 } // namespace wm 139 } // namespace wm
136 } // namespace mash 140 } // namespace mash
137 141
138 #endif // MASH_WM_WINDOW_MANAGER_APPLICATION_H_ 142 #endif // MASH_WM_WINDOW_MANAGER_APPLICATION_H_
OLDNEW
« no previous file with comments | « mash/wm/window_manager.cc ('k') | mash/wm/window_manager_application.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698