| 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) {
|
|
|