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

Side by Side Diff: ash/mus/bridge/wm_shelf_mus.h

Issue 2304443002: ash: Move ShelfWidget ownership to WmShelf and refactor access to it (Closed)
Patch Set: review comments Created 4 years, 3 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 ASH_MUS_BRIDGE_WM_SHELF_MUS_H_ 5 #ifndef ASH_MUS_BRIDGE_WM_SHELF_MUS_H_
6 #define ASH_MUS_BRIDGE_WM_SHELF_MUS_H_ 6 #define ASH_MUS_BRIDGE_WM_SHELF_MUS_H_
7 7
8 #include "ash/common/shelf/wm_shelf.h" 8 #include "ash/common/shelf/wm_shelf.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 10
11 namespace ash { 11 namespace ash {
12 12
13 class ShelfWidget; 13 class WmWindow;
14 class WmRootWindowController;
15 14
16 namespace mus { 15 namespace mus {
17 16
18 // WmShelf implementation for mus. 17 // WmShelf implementation for mus.
19 class WmShelfMus : public WmShelf { 18 class WmShelfMus : public WmShelf {
20 public: 19 public:
21 WmShelfMus(WmRootWindowController* root_window_controller); 20 explicit WmShelfMus(WmWindow* root_window);
22 ~WmShelfMus() override; 21 ~WmShelfMus() override;
23 22
24 // WmShelf: 23 // WmShelf:
25 void WillDeleteShelfLayoutManager() override; 24 void WillDeleteShelfLayoutManager() override;
26 25
27 private: 26 private:
28 // The shelf widget for this shelf.
29 std::unique_ptr<ShelfWidget> shelf_widget_;
30
31 DISALLOW_COPY_AND_ASSIGN(WmShelfMus); 27 DISALLOW_COPY_AND_ASSIGN(WmShelfMus);
32 }; 28 };
33 29
34 } // namespace mus 30 } // namespace mus
35 } // namespace ash 31 } // namespace ash
36 32
37 #endif // ASH_MUS_BRIDGE_WM_SHELF_MUS_H_ 33 #endif // ASH_MUS_BRIDGE_WM_SHELF_MUS_H_
OLDNEW
« no previous file with comments | « ash/mus/accelerators/accelerator_controller_delegate_mus.cc ('k') | ash/mus/bridge/wm_shelf_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698