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

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

Issue 1950293003: mash: Add status area container to mash window manager (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: review comments Created 4 years, 7 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/container.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 ShelfLayoutManager;
35 class StatusLayoutManager;
35 class WindowManager; 36 class WindowManager;
36 class WindowManagerApplication; 37 class WindowManagerApplication;
37 38
38 // RootWindowController manages the windows and state for a single display. 39 // RootWindowController manages the windows and state for a single display.
39 // 40 //
40 // RootWindowController deletes itself when the root mus::Window is destroyed. 41 // RootWindowController deletes itself when the root mus::Window is destroyed.
41 // You can trigger deletion explicitly by way of Destroy(). 42 // You can trigger deletion explicitly by way of Destroy().
42 class RootWindowController : public mus::WindowObserver, 43 class RootWindowController : public mus::WindowObserver,
43 public mus::WindowTreeDelegate { 44 public mus::WindowTreeDelegate {
44 public: 45 public:
(...skipping 14 matching lines...) Expand all
59 60
60 mus::Window* GetWindowForContainer(mojom::Container container); 61 mus::Window* GetWindowForContainer(mojom::Container container);
61 bool WindowIsContainer(const mus::Window* window) const; 62 bool WindowIsContainer(const mus::Window* window) const;
62 63
63 WindowManager* window_manager() { return window_manager_.get(); } 64 WindowManager* window_manager() { return window_manager_.get(); }
64 65
65 mus::WindowManagerClient* window_manager_client(); 66 mus::WindowManagerClient* window_manager_client();
66 67
67 void OnAccelerator(uint32_t id, const ui::Event& event); 68 void OnAccelerator(uint32_t id, const ui::Event& event);
68 69
69 ShelfLayout* GetShelfLayoutManager(); 70 ShelfLayoutManager* GetShelfLayoutManager();
71 StatusLayoutManager* GetStatusLayoutManager();
70 72
71 private: 73 private:
72 explicit RootWindowController(WindowManagerApplication* app); 74 explicit RootWindowController(WindowManagerApplication* app);
73 ~RootWindowController() override; 75 ~RootWindowController() override;
74 76
75 void AddAccelerators(); 77 void AddAccelerators();
76 78
77 // WindowTreeDelegate: 79 // WindowTreeDelegate:
78 void OnEmbed(mus::Window* root) override; 80 void OnEmbed(mus::Window* root) override;
79 void OnConnectionLost(mus::WindowTreeConnection* connection) override; 81 void OnConnectionLost(mus::WindowTreeConnection* connection) override;
(...skipping 19 matching lines...) Expand all
99 101
100 mus::mojom::DisplayPtr display_; 102 mus::mojom::DisplayPtr display_;
101 103
102 DISALLOW_COPY_AND_ASSIGN(RootWindowController); 104 DISALLOW_COPY_AND_ASSIGN(RootWindowController);
103 }; 105 };
104 106
105 } // namespace wm 107 } // namespace wm
106 } // namespace mash 108 } // namespace mash
107 109
108 #endif // MASH_WM_ROOT_WINDOW_CONTROLLER_H_ 110 #endif // MASH_WM_ROOT_WINDOW_CONTROLLER_H_
OLDNEW
« no previous file with comments | « mash/wm/public/interfaces/container.mojom ('k') | mash/wm/root_window_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698