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

Unified Diff: ash/mus/shell_delegate_mus.cc

Issue 1684633002: ash/mash: Introduce a ShelfDelegate implementation for mash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ash-sysui-window-container
Patch Set: tot-merge Created 4 years, 10 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/mus/shelf_delegate_mus.cc ('k') | ash/screen_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/mus/shell_delegate_mus.cc
diff --git a/ash/mus/shell_delegate_mus.cc b/ash/mus/shell_delegate_mus.cc
index d7db6813cac72aee984e62ce17f5c076221d5017..c796359ad1ed2b06d30ef14726c4b662c587d464 100644
--- a/ash/mus/shell_delegate_mus.cc
+++ b/ash/mus/shell_delegate_mus.cc
@@ -6,6 +6,7 @@
#include "ash/default_accessibility_delegate.h"
#include "ash/default_user_wallpaper_delegate.h"
+#include "ash/mus/shelf_delegate_mus.h"
#include "ash/session/session_state_delegate.h"
#include "ash/system/tray/default_system_tray_delegate.h"
#include "base/strings/string16.h"
@@ -143,8 +144,7 @@ app_list::AppListViewDelegate* ShellDelegateMus::GetAppListViewDelegate() {
}
ShelfDelegate* ShellDelegateMus::CreateShelfDelegate(ShelfModel* model) {
- NOTIMPLEMENTED();
- return nullptr;
+ return new ShelfDelegateMus(model);
}
ash::SystemTrayDelegate* ShellDelegateMus::CreateSystemTrayDelegate() {
« no previous file with comments | « ash/mus/shelf_delegate_mus.cc ('k') | ash/screen_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698