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

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

Issue 2288993002: ash: Move AppList support to ShelfWidget, expose ShelfWidget in WmShelf (Closed)
Patch Set: missed one unit test 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/wm_shelf.h ('k') | ash/first_run/first_run_helper_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/shelf/wm_shelf.cc
diff --git a/ash/common/shelf/wm_shelf.cc b/ash/common/shelf/wm_shelf.cc
index 5367c0f06fdbcdb633f3afbd1fc33e7c9fa53490..d56d4cb312b9de209b3711624117a1fdd6f1d4a3 100644
--- a/ash/common/shelf/wm_shelf.cc
+++ b/ash/common/shelf/wm_shelf.cc
@@ -47,6 +47,8 @@ void WmShelf::SetShelfLayoutManager(ShelfLayoutManager* manager) {
DCHECK(manager);
shelf_layout_manager_ = manager;
shelf_layout_manager_->AddObserver(this);
+ DCHECK(manager->shelf_widget());
+ shelf_widget_ = manager->shelf_widget();
}
WmWindow* WmShelf::GetWindow() {
@@ -250,10 +252,6 @@ ShelfView* WmShelf::GetShelfViewForTesting() {
return shelf_->shelf_view_for_testing();
}
-ShelfWidget* WmShelf::GetShelfWidgetForTesting() {
- return shelf_layout_manager_->shelf_widget();
-}
-
WmShelf::WmShelf() {}
WmShelf::~WmShelf() {}
« no previous file with comments | « ash/common/shelf/wm_shelf.h ('k') | ash/first_run/first_run_helper_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698