Chromium Code Reviews| Index: ash/mus/shell_delegate_mus.h |
| diff --git a/ash/mus/shell_delegate_mus.h b/ash/mus/shell_delegate_mus.h |
| index eb8854e72bf949e20695a6664b522c4e99f86694..6244637396258a9dfacb3c36035c9ef6b9bad4b5 100644 |
| --- a/ash/mus/shell_delegate_mus.h |
| +++ b/ash/mus/shell_delegate_mus.h |
| @@ -8,12 +8,9 @@ |
| #include <memory> |
| #include "ash/common/shell_delegate.h" |
| +#include "ash/mus/app_list_presenter_mus.h" |
| #include "base/macros.h" |
| -namespace app_list { |
| -class AppListPresenter; |
| -} |
| - |
| namespace shell { |
| class Connector; |
| } |
| @@ -22,9 +19,7 @@ namespace ash { |
| class ShellDelegateMus : public ShellDelegate { |
| public: |
| - ShellDelegateMus( |
| - std::unique_ptr<app_list::AppListPresenter> app_list_presenter, |
| - shell::Connector* connector); |
| + explicit ShellDelegateMus(shell::Connector* connector); |
| ~ShellDelegateMus() override; |
| bool IsFirstRunAfterBoot() const override; |
| @@ -54,7 +49,7 @@ class ShellDelegateMus : public ShellDelegate { |
| gfx::Image GetDeprecatedAcceleratorImage() const override; |
| private: |
| - std::unique_ptr<app_list::AppListPresenter> app_list_presenter_; |
| + AppListPresenterMus app_list_presenter_; |
| shell::Connector* connector_; |
|
mfomitchev
2016/09/12 22:39:20
I'd initialize connector_ before the app list pres
msw
2016/09/12 22:52:09
Done.
|
| DISALLOW_COPY_AND_ASSIGN(ShellDelegateMus); |