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

Unified Diff: ash/mus/shell_delegate_mus.cc

Issue 2618143002: cros: Remove some OS platform ifdefs from ash (Closed)
Patch Set: rebase Created 3 years, 11 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/context_menu_mus.cc ('k') | ash/mus/window_manager_application.h » ('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 0d0ad7132c3bea83aff7bf277f1d0335be799e0a..41b69b7b9729a556184736fc9570b35014ad4033 100644
--- a/ash/mus/shell_delegate_mus.cc
+++ b/ash/mus/shell_delegate_mus.cc
@@ -13,6 +13,7 @@
#include "ash/mus/accessibility_delegate_mus.h"
#include "ash/mus/context_menu_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"
@@ -20,12 +21,6 @@
#include "components/user_manager/user_info_impl.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 {
@@ -151,13 +146,7 @@ ShelfDelegate* ShellDelegateMus::CreateShelfDelegate(ShelfModel* model) {
}
SystemTrayDelegate* ShellDelegateMus::CreateSystemTrayDelegate() {
-#if defined(OS_CHROMEOS)
return new SystemTrayDelegateMus();
-#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() {
« no previous file with comments | « ash/mus/context_menu_mus.cc ('k') | ash/mus/window_manager_application.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698