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

Unified Diff: ash/mus/shell_delegate_mus.cc

Issue 2335833002: mash: Port ash_sysui app list presenter to mojo:ash. (Closed)
Patch Set: Reorder ShellDelegateMus members. Created 4 years, 3 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/shell_delegate_mus.h ('k') | ash/mus/window_manager.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 f4efbad70a49d2ef12fa98aae9968618214d5398..ba2eed46a0d89a05ff2d40e4ecefeb36c236208c 100644
--- a/ash/mus/shell_delegate_mus.cc
+++ b/ash/mus/shell_delegate_mus.cc
@@ -103,11 +103,8 @@ class MediaDelegateStub : public MediaDelegate {
} // namespace
-ShellDelegateMus::ShellDelegateMus(
- std::unique_ptr<app_list::AppListPresenter> app_list_presenter,
- shell::Connector* connector)
- : app_list_presenter_(std::move(app_list_presenter)),
- connector_(connector) {
+ShellDelegateMus::ShellDelegateMus(shell::Connector* connector)
+ : connector_(connector), app_list_presenter_(connector) {
// |connector_| may be null in tests.
}
@@ -165,7 +162,7 @@ void ShellDelegateMus::OpenUrlFromArc(const GURL& url) {
}
app_list::AppListPresenter* ShellDelegateMus::GetAppListPresenter() {
- return app_list_presenter_.get();
+ return &app_list_presenter_;
}
ShelfDelegate* ShellDelegateMus::CreateShelfDelegate(ShelfModel* model) {
« no previous file with comments | « ash/mus/shell_delegate_mus.h ('k') | ash/mus/window_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698