| Index: ash/mus/shell_delegate_mus.cc
|
| diff --git a/ash/mus/shell_delegate_mus.cc b/ash/mus/shell_delegate_mus.cc
|
| index 8f7bc3bc7ba4df65ac9a8ffb07c882e68ae2cb94..4a6b1047d0c6f307ca95e52fe5a235a14460d651 100644
|
| --- a/ash/mus/shell_delegate_mus.cc
|
| +++ b/ash/mus/shell_delegate_mus.cc
|
| @@ -15,7 +15,6 @@
|
| #include "ash/mus/context_menu_mus.h"
|
| #include "ash/mus/new_window_delegate_mus.h"
|
| #include "ash/mus/shelf_delegate_mus.h"
|
| -#include "ash/mus/system_tray_delegate_mus.h"
|
| #include "ash/mus/wallpaper_delegate_mus.h"
|
| #include "base/memory/ptr_util.h"
|
| #include "base/strings/string16.h"
|
| @@ -24,6 +23,12 @@
|
| #include "ui/app_list/presenter/app_list_presenter.h"
|
| #include "ui/gfx/image/image.h"
|
|
|
| +#if defined(OS_CHROMEOS)
|
| +#include "ash/mus/system_tray_delegate_mus.h"
|
| +#else
|
| +#include "ash/common/system/tray/default_system_tray_delegate.h"
|
| +#endif
|
| +
|
| namespace ash {
|
| namespace {
|
|
|
| @@ -170,7 +175,13 @@ ShelfDelegate* ShellDelegateMus::CreateShelfDelegate(ShelfModel* model) {
|
| }
|
|
|
| SystemTrayDelegate* ShellDelegateMus::CreateSystemTrayDelegate() {
|
| +#if defined(OS_CHROMEOS)
|
| return new SystemTrayDelegateMus(connector_);
|
| +#else
|
| + // Windows and Linux do not support the services required for most system tray
|
| + // items. Use the same stub delegate as ash_shell_with_content.
|
| + return new DefaultSystemTrayDelegate();
|
| +#endif
|
| }
|
|
|
| std::unique_ptr<WallpaperDelegate> ShellDelegateMus::CreateWallpaperDelegate() {
|
|
|