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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/common/shelf/shelf_widget.cc

Issue 2293183002: ash: Remove ash::Shelf in favor of ash::WmShelf (Closed)
Patch Set: rebase 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
« no previous file with comments | « ash/common/shelf/shelf_widget.h ('k') | ash/common/shelf/wm_shelf.h » ('j') | ash/common/shelf/wm_shelf.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/shelf/shelf_widget.cc
diff --git a/ash/common/shelf/shelf_widget.cc b/ash/common/shelf/shelf_widget.cc
index 1cbbeafcbf69a6af823eefe33c4d2e537e8eda27..4d6a79089a3f2fab8abc3d692b5bbb33e140e202 100644
--- a/ash/common/shelf/shelf_widget.cc
+++ b/ash/common/shelf/shelf_widget.cc
@@ -291,7 +291,6 @@ ShelfWidget::ShelfWidget(WmWindow* shelf_container,
WmWindow* status_container,
WmShelf* wm_shelf)
: wm_shelf_(wm_shelf),
- shelf_(nullptr),
delegate_view_(new DelegateView(wm_shelf, this)),
shelf_view_(nullptr),
background_animator_(SHELF_BACKGROUND_DEFAULT, wm_shelf_),
@@ -428,7 +427,6 @@ bool ShelfWidget::GetDimsShelf() const {
}
ShelfView* ShelfWidget::CreateShelfView() {
- DCHECK(!shelf_);
DCHECK(!shelf_view_);
shelf_view_ =
« no previous file with comments | « ash/common/shelf/shelf_widget.h ('k') | ash/common/shelf/wm_shelf.h » ('j') | ash/common/shelf/wm_shelf.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698