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

Unified Diff: ash/sysui/sysui_application.cc

Issue 2177663002: mash: Move ownership of ShelfDelegate to WmShell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix wallpaper tests again 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
« no previous file with comments | « ash/sysui/shelf_delegate_mus.h ('k') | ash/test/shelf_test_api.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/sysui/sysui_application.cc
diff --git a/ash/sysui/sysui_application.cc b/ash/sysui/sysui_application.cc
index 4c81776ff19eb532063f3d73016629dc6b002d3c..664adf31c606b74d52eb439ebf02efad1ec3bd2c 100644
--- a/ash/sysui/sysui_application.cc
+++ b/ash/sysui/sysui_application.cc
@@ -11,6 +11,7 @@
#include "ash/common/material_design/material_design_controller.h"
#include "ash/common/shell_window_ids.h"
+#include "ash/common/wm_shell.h"
#include "ash/desktop_background/desktop_background_controller.h"
#include "ash/display/display_manager.h"
#include "ash/host/ash_window_tree_host_init_params.h"
@@ -333,7 +334,8 @@ void SysUIApplication::Create(
::shell::Connection* connection,
mash::shelf::mojom::ShelfControllerRequest request) {
mash::shelf::mojom::ShelfController* shelf_controller =
- static_cast<ShelfDelegateMus*>(Shell::GetInstance()->GetShelfDelegate());
+ static_cast<ShelfDelegateMus*>(WmShell::Get()->shelf_delegate());
+ DCHECK(shelf_controller);
shelf_controller_bindings_.AddBinding(shelf_controller, std::move(request));
}
« no previous file with comments | « ash/sysui/shelf_delegate_mus.h ('k') | ash/test/shelf_test_api.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698