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

Unified Diff: chrome/browser/ui/ash/chrome_shell_delegate_views.cc

Issue 292123014: Ash system tray delegate for Linux (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase to ToT Created 6 years, 7 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
Index: chrome/browser/ui/ash/chrome_shell_delegate_views.cc
diff --git a/chrome/browser/ui/ash/chrome_shell_delegate_views.cc b/chrome/browser/ui/ash/chrome_shell_delegate_views.cc
index 3061692e461afabdd59e3b283688fdf14f39ce24..a837010acd1c7dab6ac675c5e29fe5fbfe462394 100644
--- a/chrome/browser/ui/ash/chrome_shell_delegate_views.cc
+++ b/chrome/browser/ui/ash/chrome_shell_delegate_views.cc
@@ -38,6 +38,10 @@
#include "chrome/browser/ui/ash/system_tray_delegate_win.h"
#endif
+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#include "chrome/browser/ui/ash/system_tray_delegate_linux.h"
+#endif
+
namespace {
class NewWindowDelegateImpl : public ChromeNewWindowDelegate {
@@ -184,6 +188,8 @@ ash::SessionStateDelegate* ChromeShellDelegate::CreateSessionStateDelegate() {
ash::SystemTrayDelegate* ChromeShellDelegate::CreateSystemTrayDelegate() {
#if defined(OS_WIN)
return CreateWindowsSystemTrayDelegate();
+#elif defined(OS_LINUX) && !defined(OS_CHROMEOS)
+ return CreateLinuxSystemTrayDelegate();
#else
return new ash::DefaultSystemTrayDelegate;
#endif

Powered by Google App Engine
This is Rietveld 408576698