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

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

Issue 2293183002: ash: Remove ash::Shelf in favor of ash::WmShelf (Closed)
Patch Set: rebase again 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 Shelf;
14 class ShelfWidget; 13 class ShelfWidget;
15 class WmRootWindowController; 14 class WmRootWindowController;
16 15
17 namespace mus { 16 namespace mus {
18 17
19 // WmShelf implementation for mus. 18 // WmShelf implementation for mus.
20 class WmShelfMus : public WmShelf { 19 class WmShelfMus : public WmShelf {
21 public: 20 public:
22 WmShelfMus(WmRootWindowController* root_window_controller); 21 WmShelfMus(WmRootWindowController* root_window_controller);
23 ~WmShelfMus() override; 22 ~WmShelfMus() override;
24 23
25 // WmShelf: 24 // WmShelf:
26 void WillDeleteShelfLayoutManager() override; 25 void WillDeleteShelfLayoutManager() override;
27 26
28 private: 27 private:
29 // Legacy shelf controller. Only present after shelf is created (post-login).
30 std::unique_ptr<Shelf> shelf_;
31
32 // The shelf widget for this shelf. 28 // The shelf widget for this shelf.
33 std::unique_ptr<ShelfWidget> shelf_widget_; 29 std::unique_ptr<ShelfWidget> shelf_widget_;
34 30
35 DISALLOW_COPY_AND_ASSIGN(WmShelfMus); 31 DISALLOW_COPY_AND_ASSIGN(WmShelfMus);
36 }; 32 };
37 33
38 } // namespace mus 34 } // namespace mus
39 } // namespace ash 35 } // namespace ash
40 36
41 #endif // ASH_MUS_BRIDGE_WM_SHELF_MUS_H_ 37 #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