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

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

Issue 2230723003: mash: Show status area widget, attempt 2 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 4 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/bridge/wm_shell_mus.cc ('k') | ash/mus/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 ASH_MUS_ROOT_WINDOW_CONTROLLER_H_ 5 #ifndef ASH_MUS_ROOT_WINDOW_CONTROLLER_H_
6 #define ASH_MUS_ROOT_WINDOW_CONTROLLER_H_ 6 #define ASH_MUS_ROOT_WINDOW_CONTROLLER_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "ash/mus/disconnected_app_handler.h" 10 #include "ash/mus/disconnected_app_handler.h"
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 public: 42 public:
43 RootWindowController(WindowManager* window_manager, 43 RootWindowController(WindowManager* window_manager,
44 ui::Window* root, 44 ui::Window* root,
45 const display::Display& display); 45 const display::Display& display);
46 ~RootWindowController() override; 46 ~RootWindowController() override;
47 47
48 shell::Connector* GetConnector(); 48 shell::Connector* GetConnector();
49 49
50 ui::Window* root() { return root_; } 50 ui::Window* root() { return root_; }
51 51
52 int window_count() { return window_count_; }
53
54 ui::Window* NewTopLevelWindow( 52 ui::Window* NewTopLevelWindow(
55 std::map<std::string, std::vector<uint8_t>>* properties); 53 std::map<std::string, std::vector<uint8_t>>* properties);
56 54
57 ui::Window* GetWindowForContainer(mojom::Container container); 55 ui::Window* GetWindowForContainer(mojom::Container container);
58 56
59 WmWindowMus* GetWindowByShellWindowId(int id); 57 WmWindowMus* GetWindowByShellWindowId(int id);
60 58
61 WindowManager* window_manager() { return window_manager_; } 59 WindowManager* window_manager() { return window_manager_; }
62 60
63 const display::Display& display() const { return display_; } 61 const display::Display& display() const { return display_; }
(...skipping 14 matching lines...) Expand all
78 76
79 gfx::Rect CalculateDefaultBounds(ui::Window* window) const; 77 gfx::Rect CalculateDefaultBounds(ui::Window* window) const;
80 gfx::Rect GetMaximizedWindowBounds() const; 78 gfx::Rect GetMaximizedWindowBounds() const;
81 79
82 // ShelfLayoutManagerDelegate: 80 // ShelfLayoutManagerDelegate:
83 void OnShelfWindowAvailable() override; 81 void OnShelfWindowAvailable() override;
84 82
85 // Creates the necessary set of layout managers in the shell windows. 83 // Creates the necessary set of layout managers in the shell windows.
86 void CreateLayoutManagers(); 84 void CreateLayoutManagers();
87 85
86 // Creates the status area widget that contains the system tray menu.
87 void CreateStatusArea();
88
88 WindowManager* window_manager_; 89 WindowManager* window_manager_;
89 ui::Window* root_; 90 ui::Window* root_;
90 int window_count_ = 0; 91 int window_count_ = 0;
91 92
92 display::Display display_; 93 display::Display display_;
93 94
94 std::unique_ptr<RootWindowControllerCommon> root_window_controller_common_; 95 std::unique_ptr<RootWindowControllerCommon> root_window_controller_common_;
95 96
96 std::unique_ptr<WmRootWindowControllerMus> wm_root_window_controller_; 97 std::unique_ptr<WmRootWindowControllerMus> wm_root_window_controller_;
97 std::unique_ptr<WmShelfMus> wm_shelf_; 98 std::unique_ptr<WmShelfMus> wm_shelf_;
98 99
99 // Owned by the corresponding container. 100 // Owned by the corresponding container.
100 WorkspaceLayoutManager* workspace_layout_manager_ = nullptr; 101 WorkspaceLayoutManager* workspace_layout_manager_ = nullptr;
101 std::map<ui::Window*, std::unique_ptr<LayoutManager>> layout_managers_; 102 std::map<ui::Window*, std::unique_ptr<LayoutManager>> layout_managers_;
102 103
103 std::unique_ptr<AlwaysOnTopController> always_on_top_controller_; 104 std::unique_ptr<AlwaysOnTopController> always_on_top_controller_;
104 105
105 std::unique_ptr<DisconnectedAppHandler> disconnected_app_handler_; 106 std::unique_ptr<DisconnectedAppHandler> disconnected_app_handler_;
106 107
107 DISALLOW_COPY_AND_ASSIGN(RootWindowController); 108 DISALLOW_COPY_AND_ASSIGN(RootWindowController);
108 }; 109 };
109 110
110 } // namespace mus 111 } // namespace mus
111 } // namespace ash 112 } // namespace ash
112 113
113 #endif // ASH_MUS_ROOT_WINDOW_CONTROLLER_H_ 114 #endif // ASH_MUS_ROOT_WINDOW_CONTROLLER_H_
OLDNEW
« no previous file with comments | « ash/mus/bridge/wm_shell_mus.cc ('k') | ash/mus/root_window_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698