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

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

Issue 2761233003: Adds ability for accelerators to add key/value pairs to KeyEvent (Closed)
Patch Set: feedback and compile Created 3 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 | « ash/mus/accelerators/accelerator_handler.h ('k') | ash/mus/window_manager.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_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 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 void OnWmWillCreateDisplay(const display::Display& display) override; 153 void OnWmWillCreateDisplay(const display::Display& display) override;
154 void OnWmNewDisplay(std::unique_ptr<aura::WindowTreeHostMus> window_tree_host, 154 void OnWmNewDisplay(std::unique_ptr<aura::WindowTreeHostMus> window_tree_host,
155 const display::Display& display) override; 155 const display::Display& display) override;
156 void OnWmDisplayRemoved(aura::WindowTreeHostMus* window_tree_host) override; 156 void OnWmDisplayRemoved(aura::WindowTreeHostMus* window_tree_host) override;
157 void OnWmDisplayModified(const display::Display& display) override; 157 void OnWmDisplayModified(const display::Display& display) override;
158 void OnWmPerformMoveLoop(aura::Window* window, 158 void OnWmPerformMoveLoop(aura::Window* window,
159 ui::mojom::MoveLoopSource source, 159 ui::mojom::MoveLoopSource source,
160 const gfx::Point& cursor_location, 160 const gfx::Point& cursor_location,
161 const base::Callback<void(bool)>& on_done) override; 161 const base::Callback<void(bool)>& on_done) override;
162 void OnWmCancelMoveLoop(aura::Window* window) override; 162 void OnWmCancelMoveLoop(aura::Window* window) override;
163 ui::mojom::EventResult OnAccelerator(uint32_t id, 163 ui::mojom::EventResult OnAccelerator(
164 const ui::Event& event) override; 164 uint32_t id,
165 const ui::Event& event,
166 std::unordered_map<std::string, std::vector<uint8_t>>* properties)
167 override;
165 void OnWmSetClientArea( 168 void OnWmSetClientArea(
166 aura::Window* window, 169 aura::Window* window,
167 const gfx::Insets& insets, 170 const gfx::Insets& insets,
168 const std::vector<gfx::Rect>& additional_client_areas) override; 171 const std::vector<gfx::Rect>& additional_client_areas) override;
169 bool IsWindowActive(aura::Window* window) override; 172 bool IsWindowActive(aura::Window* window) override;
170 void OnWmDeactivateWindow(aura::Window* window) override; 173 void OnWmDeactivateWindow(aura::Window* window) override;
171 174
172 service_manager::Connector* connector_; 175 service_manager::Connector* connector_;
173 display::mojom::DisplayControllerPtr display_controller_; 176 display::mojom::DisplayControllerPtr display_controller_;
174 177
(...skipping 24 matching lines...) Expand all
199 // See WmShellMus's constructor for details. Tests may set to false. 202 // See WmShellMus's constructor for details. Tests may set to false.
200 bool create_session_state_delegate_stub_for_test_ = true; 203 bool create_session_state_delegate_stub_for_test_ = true;
201 204
202 DISALLOW_COPY_AND_ASSIGN(WindowManager); 205 DISALLOW_COPY_AND_ASSIGN(WindowManager);
203 }; 206 };
204 207
205 } // namespace mus 208 } // namespace mus
206 } // namespace ash 209 } // namespace ash
207 210
208 #endif // ASH_MUS_WINDOW_MANAGER_H_ 211 #endif // ASH_MUS_WINDOW_MANAGER_H_
OLDNEW
« no previous file with comments | « ash/mus/accelerators/accelerator_handler.h ('k') | ash/mus/window_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698