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

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

Issue 1835403002: Support additional mash shelf alignments. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments. Created 4 years, 8 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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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_ROOT_WINDOW_CONTROLLER_H_ 5 #ifndef MASH_WM_ROOT_WINDOW_CONTROLLER_H_
6 #define MASH_WM_ROOT_WINDOW_CONTROLLER_H_ 6 #define MASH_WM_ROOT_WINDOW_CONTROLLER_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "components/mus/public/cpp/window_observer.h" 10 #include "components/mus/public/cpp/window_observer.h"
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 mus::Window* GetWindowForContainer(mojom::Container container); 59 mus::Window* GetWindowForContainer(mojom::Container container);
60 mus::Window* GetWindowById(mus::Id id); 60 mus::Window* GetWindowById(mus::Id id);
61 bool WindowIsContainer(const mus::Window* window) const; 61 bool WindowIsContainer(const mus::Window* window) const;
62 62
63 WindowManager* window_manager() { return window_manager_.get(); } 63 WindowManager* window_manager() { return window_manager_.get(); }
64 64
65 mus::WindowManagerClient* window_manager_client(); 65 mus::WindowManagerClient* window_manager_client();
66 66
67 void OnAccelerator(uint32_t id, const ui::Event& event); 67 void OnAccelerator(uint32_t id, const ui::Event& event);
68 68
69 LayoutManager* GetLayoutManagerForContainer(mojom::Container container);
70
69 private: 71 private:
70 explicit RootWindowController(WindowManagerApplication* app); 72 explicit RootWindowController(WindowManagerApplication* app);
71 ~RootWindowController() override; 73 ~RootWindowController() override;
72 74
73 void AddAccelerators(); 75 void AddAccelerators();
74 76
75 // WindowTreeDelegate: 77 // WindowTreeDelegate:
76 void OnEmbed(mus::Window* root) override; 78 void OnEmbed(mus::Window* root) override;
77 void OnConnectionLost(mus::WindowTreeConnection* connection) override; 79 void OnConnectionLost(mus::WindowTreeConnection* connection) override;
78 80
(...skipping 17 matching lines...) Expand all
96 98
97 mus::mojom::DisplayPtr display_; 99 mus::mojom::DisplayPtr display_;
98 100
99 DISALLOW_COPY_AND_ASSIGN(RootWindowController); 101 DISALLOW_COPY_AND_ASSIGN(RootWindowController);
100 }; 102 };
101 103
102 } // namespace wm 104 } // namespace wm
103 } // namespace mash 105 } // namespace mash
104 106
105 #endif // MASH_WM_ROOT_WINDOW_CONTROLLER_H_ 107 #endif // MASH_WM_ROOT_WINDOW_CONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698