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: ash/mus/window_manager.h

Issue 2886253002: mash: remove more shell/shelf WmWindow usage. (Closed)
Patch Set: Fix WmShelf::ForWindow. Created 3 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 | « ash/mus/top_level_window_factory.cc ('k') | ash/mus/window_manager.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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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_WINDOW_MANAGER_H_ 5 #ifndef ASH_MUS_WINDOW_MANAGER_H_
6 #define ASH_MUS_WINDOW_MANAGER_H_ 6 #define ASH_MUS_WINDOW_MANAGER_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory> 10 #include <memory>
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 const display::Display& display, 138 const display::Display& display,
139 ash::RootWindowController::RootWindowType root_window_type); 139 ash::RootWindowController::RootWindowType root_window_type);
140 140
141 // Deletes the specified RootWindowController. Called when a display is 141 // Deletes the specified RootWindowController. Called when a display is
142 // removed. |in_shutdown| is true if called from Shutdown(). 142 // removed. |in_shutdown| is true if called from Shutdown().
143 void DestroyRootWindowController(RootWindowController* root_window_controller, 143 void DestroyRootWindowController(RootWindowController* root_window_controller,
144 bool in_shutdown); 144 bool in_shutdown);
145 145
146 void Shutdown(); 146 void Shutdown();
147 147
148 RootWindowController* GetPrimaryRootWindowController();
149
150 // WindowTreeClientDelegate: 148 // WindowTreeClientDelegate:
151 void OnEmbed( 149 void OnEmbed(
152 std::unique_ptr<aura::WindowTreeHostMus> window_tree_host) override; 150 std::unique_ptr<aura::WindowTreeHostMus> window_tree_host) override;
153 void OnEmbedRootDestroyed(aura::WindowTreeHostMus* window_tree_host) override; 151 void OnEmbedRootDestroyed(aura::WindowTreeHostMus* window_tree_host) override;
154 void OnLostConnection(aura::WindowTreeClient* client) override; 152 void OnLostConnection(aura::WindowTreeClient* client) override;
155 void OnPointerEventObserved(const ui::PointerEvent& event, 153 void OnPointerEventObserved(const ui::PointerEvent& event,
156 aura::Window* target) override; 154 aura::Window* target) override;
157 aura::PropertyConverter* GetPropertyConverter() override; 155 aura::PropertyConverter* GetPropertyConverter() override;
158 156
159 // WindowManagerDelegate: 157 // WindowManagerDelegate:
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
242 240
243 std::unique_ptr<ui::InputDeviceClient> input_device_client_; 241 std::unique_ptr<ui::InputDeviceClient> input_device_client_;
244 242
245 DISALLOW_COPY_AND_ASSIGN(WindowManager); 243 DISALLOW_COPY_AND_ASSIGN(WindowManager);
246 }; 244 };
247 245
248 } // namespace mus 246 } // namespace mus
249 } // namespace ash 247 } // namespace ash
250 248
251 #endif // ASH_MUS_WINDOW_MANAGER_H_ 249 #endif // ASH_MUS_WINDOW_MANAGER_H_
OLDNEW
« no previous file with comments | « ash/mus/top_level_window_factory.cc ('k') | ash/mus/window_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698