mash: Fix system tray clock 12/24 hour time setting

ash/mus/window_manager_application.h

Index: ash/mus/window_manager_application.h
diff --git a/ash/mus/window_manager_application.h b/ash/mus/window_manager_application.h
index ee8ac405d2ef8baaf5a4a20d71ca1239c9d013b5..a5cf311743b6c03dafd516b15877c92cb4d6afb1 100644
--- a/ash/mus/window_manager_application.h
+++ b/ash/mus/window_manager_application.h
@@ -11,6 +11,7 @@
 #include <set>
 
 #include "ash/public/interfaces/shelf.mojom.h"
+#include "ash/public/interfaces/system_tray.mojom.h"
 #include "ash/public/interfaces/wallpaper.mojom.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
@@ -54,6 +55,7 @@ class WindowManager;
 class WindowManagerApplication
     : public shell::Service,
       public shell::InterfaceFactory<ash::mojom::ShelfController>,

[James Cook, 2016/09/19 22:51:38]

Are all these things intentionally left in the ash:: namespace because of their
mojom? If not, should I remove ash:: throughout this file and the .cc?

[sky, 2016/09/19 23:47:52]

If you mean that ash:: is redundant with the namespace of this file and can be
removed, go for it. As long as it compiles SGTM. It may be a holdover from when
this code was in the mash namespace.

+      public shell::InterfaceFactory<ash::mojom::SystemTray>,
       public shell::InterfaceFactory<ash::mojom::WallpaperController>,
       public shell::InterfaceFactory<ui::mojom::AcceleratorRegistrar>,
       public mash::session::mojom::ScreenlockStateListener {
@@ -84,6 +86,10 @@ class WindowManagerApplication
   void Create(const shell::Identity& remote_identity,
               ash::mojom::ShelfControllerRequest request) override;
 
+  // InterfaceFactory<ash::mojom::SystemTray>:
+  void Create(const shell::Identity& remote_identity,
+              ash::mojom::SystemTrayRequest request) override;
+
   // InterfaceFactory<ash::mojom::WallpaperController>:
   void Create(const shell::Identity& remote_identity,
               ash::mojom::WallpaperControllerRequest request) override;
@@ -108,6 +114,7 @@ class WindowManagerApplication
   scoped_refptr<base::SequencedWorkerPool> blocking_pool_;
 
   mojo::BindingSet<ash::mojom::ShelfController> shelf_controller_bindings_;
+  mojo::BindingSet<ash::mojom::SystemTray> system_tray_bindings_;
   mojo::BindingSet<ash::mojom::WallpaperController>
       wallpaper_controller_bindings_;