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

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

Issue 1957653003: mash: Don't close system tray bubble for clicks in menus/notifications (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . 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
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 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 72
73 private: 73 private:
74 explicit RootWindowController(WindowManagerApplication* app); 74 explicit RootWindowController(WindowManagerApplication* app);
75 ~RootWindowController() override; 75 ~RootWindowController() override;
76 76
77 void AddAccelerators(); 77 void AddAccelerators();
78 78
79 // WindowTreeDelegate: 79 // WindowTreeDelegate:
80 void OnEmbed(mus::Window* root) override; 80 void OnEmbed(mus::Window* root) override;
81 void OnConnectionLost(mus::WindowTreeConnection* connection) override; 81 void OnConnectionLost(mus::WindowTreeConnection* connection) override;
82 void OnEventObserved(const ui::Event& event) override; 82 void OnEventObserved(const ui::Event& event, mus::Window* target) override;
83 83
84 // mus::WindowObserver: 84 // mus::WindowObserver:
85 void OnWindowDestroyed(mus::Window* window) override; 85 void OnWindowDestroyed(mus::Window* window) override;
86 86
87 // Sets up the window containers used for z-space management. 87 // Sets up the window containers used for z-space management.
88 void CreateContainer(mash::wm::mojom::Container container, 88 void CreateContainer(mash::wm::mojom::Container container,
89 mash::wm::mojom::Container parent_container); 89 mash::wm::mojom::Container parent_container);
90 void CreateContainers(); 90 void CreateContainers();
91 91
92 WindowManagerApplication* app_; 92 WindowManagerApplication* app_;
93 mus::Window* root_; 93 mus::Window* root_;
94 int window_count_; 94 int window_count_;
95 95
96 std::unique_ptr<WindowManager> window_manager_; 96 std::unique_ptr<WindowManager> window_manager_;
97 97
98 std::map<mus::Window*, std::unique_ptr<LayoutManager>> layout_manager_; 98 std::map<mus::Window*, std::unique_ptr<LayoutManager>> layout_manager_;
99 99
100 std::unique_ptr<ShadowController> shadow_controller_; 100 std::unique_ptr<ShadowController> shadow_controller_;
101 101
102 mus::mojom::DisplayPtr display_; 102 mus::mojom::DisplayPtr display_;
103 103
104 DISALLOW_COPY_AND_ASSIGN(RootWindowController); 104 DISALLOW_COPY_AND_ASSIGN(RootWindowController);
105 }; 105 };
106 106
107 } // namespace wm 107 } // namespace wm
108 } // namespace mash 108 } // namespace mash
109 109
110 #endif // MASH_WM_ROOT_WINDOW_CONTROLLER_H_ 110 #endif // MASH_WM_ROOT_WINDOW_CONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698