Chromium Code Reviews| Index: ash/mus/shell_delegate_mus.cc |
| diff --git a/ash/mus/shell_delegate_mus.cc b/ash/mus/shell_delegate_mus.cc |
| index 879130725ffad5b780c333704a8127eabc5a3ac4..27910f3da4affc0fb8f6092dbe30ca2746acd45a 100644 |
| --- a/ash/mus/shell_delegate_mus.cc |
| +++ b/ash/mus/shell_delegate_mus.cc |
| @@ -14,6 +14,7 @@ |
| #include "ash/system/tray/default_system_tray_delegate.h" |
| #include "base/strings/string16.h" |
| #include "components/user_manager/user_info_impl.h" |
| +#include "ui/app_list/shower/app_list_shower.h" |
| #include "ui/gfx/image/image.h" |
| namespace ash { |
| @@ -93,9 +94,31 @@ class MediaDelegateStub : public MediaDelegate { |
| DISALLOW_COPY_AND_ASSIGN(MediaDelegateStub); |
| }; |
| +class AppListShowerStub : public app_list::AppListShower { |
|
msw
2016/04/11 17:07:43
nit: AppListShowerMus? It's readily discernable th
James Cook
2016/04/11 17:13:39
Done.
|
| + public: |
| + AppListShowerStub() {} |
| + ~AppListShowerStub() override {} |
| + |
| + // app_list::AppListShower: |
| + void Show(aura::Window* window) override { NOTIMPLEMENTED(); } |
| + void Dismiss() override { NOTIMPLEMENTED(); } |
| + bool IsVisible() const override { |
| + NOTIMPLEMENTED(); |
| + return false; |
| + } |
| + bool GetTargetVisibility() const override { |
| + NOTIMPLEMENTED(); |
| + return false; |
| + } |
| + |
| + private: |
| + DISALLOW_COPY_AND_ASSIGN(AppListShowerStub); |
| +}; |
| + |
| } // namespace |
| -ShellDelegateMus::ShellDelegateMus() {} |
| +ShellDelegateMus::ShellDelegateMus() |
| + : app_list_shower_(new AppListShowerStub) {} |
| ShellDelegateMus::~ShellDelegateMus() {} |
| @@ -165,8 +188,8 @@ void ShellDelegateMus::OpenUrl(const GURL& url) { |
| } |
| app_list::AppListShower* ShellDelegateMus::GetAppListShower() { |
| - NOTIMPLEMENTED(); |
| - return nullptr; |
| + // Individual methods are marked NOTIMPLEMENTED. |
|
msw
2016/04/11 17:07:43
nit: eh, comment not worthwhile?
James Cook
2016/04/11 17:13:39
Done.
|
| + return app_list_shower_.get(); |
| } |
| ShelfDelegate* ShellDelegateMus::CreateShelfDelegate(ShelfModel* model) { |