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

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

Issue 2808723004: Renames WmShell to ShellPort (Closed)
Patch Set: feedback Created 3 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
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 199 matching lines...) Expand 10 before | Expand all | Expand 10 after
210 210
211 std::map<uint16_t, AcceleratorHandler*> accelerator_handlers_; 211 std::map<uint16_t, AcceleratorHandler*> accelerator_handlers_;
212 uint16_t next_accelerator_namespace_id_ = 0u; 212 uint16_t next_accelerator_namespace_id_ = 0u;
213 213
214 scoped_refptr<base::SequencedWorkerPool> blocking_pool_; 214 scoped_refptr<base::SequencedWorkerPool> blocking_pool_;
215 215
216 // The ShellDelegate to install. This may be null, in which case 216 // The ShellDelegate to install. This may be null, in which case
217 // ShellDelegateMus is used. 217 // ShellDelegateMus is used.
218 std::unique_ptr<ShellDelegate> shell_delegate_; 218 std::unique_ptr<ShellDelegate> shell_delegate_;
219 219
220 // See WmShellMus's constructor for details. Tests may set to false. 220 // See ShellPortMash's constructor for details. Tests may set to false.
221 bool create_session_state_delegate_stub_for_test_ = true; 221 bool create_session_state_delegate_stub_for_test_ = true;
222 222
223 // State that is only valid during a drag. 223 // State that is only valid during a drag.
224 struct DragState; 224 struct DragState;
225 std::unique_ptr<DragState> drag_state_; 225 std::unique_ptr<DragState> drag_state_;
226 226
227 DISALLOW_COPY_AND_ASSIGN(WindowManager); 227 DISALLOW_COPY_AND_ASSIGN(WindowManager);
228 }; 228 };
229 229
230 } // namespace mus 230 } // namespace mus
231 } // namespace ash 231 } // namespace ash
232 232
233 #endif // ASH_MUS_WINDOW_MANAGER_H_ 233 #endif // ASH_MUS_WINDOW_MANAGER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698