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

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: Sync and rebase; address comments (sorry). 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
« no previous file with comments | « mash/wm/public/interfaces/shelf_layout.mojom ('k') | mash/wm/root_window_controller.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 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 13 matching lines...) Expand all
24 24
25 namespace ui { 25 namespace ui {
26 class Event; 26 class Event;
27 } 27 }
28 28
29 namespace mash { 29 namespace mash {
30 namespace wm { 30 namespace wm {
31 31
32 class LayoutManager; 32 class LayoutManager;
33 class ShadowController; 33 class ShadowController;
34 class ShelfLayout;
34 class WindowManager; 35 class WindowManager;
35 class WindowManagerApplication; 36 class WindowManagerApplication;
36 37
37 // RootWindowController manages the windows and state for a single display. 38 // RootWindowController manages the windows and state for a single display.
38 // 39 //
39 // RootWindowController deletes itself when the root mus::Window is destroyed. 40 // RootWindowController deletes itself when the root mus::Window is destroyed.
40 // You can trigger deletion explicitly by way of Destroy(). 41 // You can trigger deletion explicitly by way of Destroy().
41 class RootWindowController : public mus::WindowObserver, 42 class RootWindowController : public mus::WindowObserver,
42 public mus::WindowTreeDelegate { 43 public mus::WindowTreeDelegate {
43 public: 44 public:
(...skipping 14 matching lines...) Expand all
58 59
59 mus::Window* GetWindowForContainer(mojom::Container container); 60 mus::Window* GetWindowForContainer(mojom::Container container);
60 bool WindowIsContainer(const mus::Window* window) const; 61 bool WindowIsContainer(const mus::Window* window) const;
61 62
62 WindowManager* window_manager() { return window_manager_.get(); } 63 WindowManager* window_manager() { return window_manager_.get(); }
63 64
64 mus::WindowManagerClient* window_manager_client(); 65 mus::WindowManagerClient* window_manager_client();
65 66
66 void OnAccelerator(uint32_t id, const ui::Event& event); 67 void OnAccelerator(uint32_t id, const ui::Event& event);
67 68
69 ShelfLayout* GetShelfLayoutManager();
70
68 private: 71 private:
69 explicit RootWindowController(WindowManagerApplication* app); 72 explicit RootWindowController(WindowManagerApplication* app);
70 ~RootWindowController() override; 73 ~RootWindowController() override;
71 74
72 void AddAccelerators(); 75 void AddAccelerators();
73 76
74 // WindowTreeDelegate: 77 // WindowTreeDelegate:
75 void OnEmbed(mus::Window* root) override; 78 void OnEmbed(mus::Window* root) override;
76 void OnConnectionLost(mus::WindowTreeConnection* connection) override; 79 void OnConnectionLost(mus::WindowTreeConnection* connection) override;
77 80
(...skipping 17 matching lines...) Expand all
95 98
96 mus::mojom::DisplayPtr display_; 99 mus::mojom::DisplayPtr display_;
97 100
98 DISALLOW_COPY_AND_ASSIGN(RootWindowController); 101 DISALLOW_COPY_AND_ASSIGN(RootWindowController);
99 }; 102 };
100 103
101 } // namespace wm 104 } // namespace wm
102 } // namespace mash 105 } // namespace mash
103 106
104 #endif // MASH_WM_ROOT_WINDOW_CONTROLLER_H_ 107 #endif // MASH_WM_ROOT_WINDOW_CONTROLLER_H_
OLDNEW
« no previous file with comments | « mash/wm/public/interfaces/shelf_layout.mojom ('k') | mash/wm/root_window_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698