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

Unified Diff: ash/test/shell_test_api.cc

Issue 2169533002: mash: Migrate shelf app list button to wm common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: move files, cleanup Created 4 years, 5 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/test/shell_test_api.cc
diff --git a/ash/test/shell_test_api.cc b/ash/test/shell_test_api.cc
index f64bc305d958d2e8d23d6510d366e0f9f2973f4b..457d201f97d5f0fb2dfa3cf7075a32c0b4635eec 100644
--- a/ash/test/shell_test_api.cc
+++ b/ash/test/shell_test_api.cc
@@ -34,7 +34,8 @@ AshNativeCursorManager* ShellTestApi::ash_native_cursor_manager() {
}
ShelfModel* ShellTestApi::shelf_model() {
- return shell_->shelf_model_.get();
+ // TODO(jamescook): Remove this and access WmShell::shelf_model() directly.
+ return shell_->wm_shell_->shelf_model();
}
DragDropController* ShellTestApi::drag_drop_controller() {

Powered by Google App Engine
This is Rietveld 408576698