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

Unified Diff: mash/wm/root_window_controller.h

Issue 1656123002: Moves accelerator registration to WindowManager (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix mandoline Created 4 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « mash/wm/accelerator_registrar_impl.cc ('k') | mash/wm/root_window_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mash/wm/root_window_controller.h
diff --git a/mash/wm/root_window_controller.h b/mash/wm/root_window_controller.h
index c70ac8311d696ad64d5a076dd21a798823674555..bacd5280f161d7398a3c17c065a98099e124e684 100644
--- a/mash/wm/root_window_controller.h
+++ b/mash/wm/root_window_controller.h
@@ -56,11 +56,15 @@ class RootWindowController : public mus::WindowObserver,
mus::Window* GetWindowById(mus::Id id);
bool WindowIsContainer(const mus::Window* window) const;
+ WindowManager* window_manager() { return window_manager_.get(); }
+
// TODO(sky): don't expose this, it may be null.
mus::mojom::WindowTreeHost* window_tree_host() {
return window_tree_host_.get();
}
+ void OnAccelerator(uint32_t id, mus::mojom::EventPtr event);
+
private:
explicit RootWindowController(WindowManagerApplication* app);
~RootWindowController() override;
@@ -70,9 +74,6 @@ class RootWindowController : public mus::WindowObserver,
// Sets up the window containers used for z-space management.
void CreateContainers();
- // WindowTreeHostClient:
- void OnAccelerator(uint32_t id, mus::mojom::EventPtr event) override;
-
// WindowTreeDelegate:
void OnEmbed(mus::Window* root) override;
void OnConnectionLost(mus::WindowTreeConnection* connection) override;
« no previous file with comments | « mash/wm/accelerator_registrar_impl.cc ('k') | mash/wm/root_window_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698