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

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

Issue 2125883003: Adds ability for pre-target accelerators to not consume events (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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 #ifndef ASH_MUS_WINDOW_MANAGER_H_ 5 #ifndef ASH_MUS_WINDOW_MANAGER_H_
6 #define ASH_MUS_WINDOW_MANAGER_H_ 6 #define ASH_MUS_WINDOW_MANAGER_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory> 10 #include <memory>
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 bool OnWmSetProperty( 93 bool OnWmSetProperty(
94 ::ui::Window* window, 94 ::ui::Window* window,
95 const std::string& name, 95 const std::string& name,
96 std::unique_ptr<std::vector<uint8_t>>* new_data) override; 96 std::unique_ptr<std::vector<uint8_t>>* new_data) override;
97 ::ui::Window* OnWmCreateTopLevelWindow( 97 ::ui::Window* OnWmCreateTopLevelWindow(
98 std::map<std::string, std::vector<uint8_t>>* properties) override; 98 std::map<std::string, std::vector<uint8_t>>* properties) override;
99 void OnWmClientJankinessChanged(const std::set<::ui::Window*>& client_windows, 99 void OnWmClientJankinessChanged(const std::set<::ui::Window*>& client_windows,
100 bool not_responding) override; 100 bool not_responding) override;
101 void OnWmNewDisplay(::ui::Window* window, 101 void OnWmNewDisplay(::ui::Window* window,
102 const display::Display& display) override; 102 const display::Display& display) override;
103 void OnAccelerator(uint32_t id, const ui::Event& event) override; 103 ui::mojom::EventResult OnAccelerator(uint32_t id,
104 const ui::Event& event) override;
104 105
105 shell::Connector* connector_; 106 shell::Connector* connector_;
106 107
107 ::ui::WindowTreeClient* window_tree_client_ = nullptr; 108 ::ui::WindowTreeClient* window_tree_client_ = nullptr;
108 109
109 ::ui::WindowManagerClient* window_manager_client_ = nullptr; 110 ::ui::WindowManagerClient* window_manager_client_ = nullptr;
110 111
111 std::unique_ptr<ShadowController> shadow_controller_; 112 std::unique_ptr<ShadowController> shadow_controller_;
112 113
113 std::set<std::unique_ptr<RootWindowController>> root_window_controllers_; 114 std::set<std::unique_ptr<RootWindowController>> root_window_controllers_;
114 115
115 base::ObserverList<WindowManagerObserver> observers_; 116 base::ObserverList<WindowManagerObserver> observers_;
116 117
117 std::unique_ptr<display::Screen> screen_; 118 std::unique_ptr<display::Screen> screen_;
118 119
119 std::unique_ptr<WmShellMus> shell_; 120 std::unique_ptr<WmShellMus> shell_;
120 121
121 std::unique_ptr<WmLookupMus> lookup_; 122 std::unique_ptr<WmLookupMus> lookup_;
122 123
123 DISALLOW_COPY_AND_ASSIGN(WindowManager); 124 DISALLOW_COPY_AND_ASSIGN(WindowManager);
124 }; 125 };
125 126
126 } // namespace mus 127 } // namespace mus
127 } // namespace ash 128 } // namespace ash
128 129
129 #endif // ASH_MUS_WINDOW_MANAGER_H_ 130 #endif // ASH_MUS_WINDOW_MANAGER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698