| Index: ash/root_window_controller.h
|
| diff --git a/ash/root_window_controller.h b/ash/root_window_controller.h
|
| index a620e2a2186013540fa5a35e945793b40b680395..4fbef3f1a27642aedc3feabc92d39df9a70b0136 100644
|
| --- a/ash/root_window_controller.h
|
| +++ b/ash/root_window_controller.h
|
| @@ -280,6 +280,9 @@ class ASH_EXPORT RootWindowController : public ShellObserver {
|
| // to it during construction of the shelf widget and status tray.
|
| std::unique_ptr<WmShelfAura> wm_shelf_aura_;
|
|
|
| + // Legacy shelf controller. Only present after shelf is created (post-login).
|
| + std::unique_ptr<Shelf> shelf_;
|
| +
|
| // The shelf widget for this root window.
|
| std::unique_ptr<ShelfWidget> shelf_widget_;
|
|
|
|
|