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

Unified Diff: ash/root_window_controller.h

Issue 2247503002: mash: Create and show a shelf in mash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Cleanup. Created 4 years, 4 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 side-by-side diff with in-line comments
Download patch
Index: ash/root_window_controller.h
diff --git a/ash/root_window_controller.h b/ash/root_window_controller.h
index 4fbef3f1a27642aedc3feabc92d39df9a70b0136..a620e2a2186013540fa5a35e945793b40b680395 100644
--- a/ash/root_window_controller.h
+++ b/ash/root_window_controller.h
@@ -280,9 +280,6 @@ 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_;

Powered by Google App Engine
This is Rietveld 408576698