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

ash/mus/window_manager_application.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/mus/window_manager_application.h"
 
 #include <utility>
 
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/wm_shell.h"
 #include "ash/mus/accelerators/accelerator_registrar_impl.h"
 #include "ash/mus/native_widget_factory_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 "ash/mus/window_manager.h"
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
 #include "services/shell/public/cpp/connection.h"
 #include "services/shell/public/cpp/connector.h"
 #include "services/tracing/public/cpp/provider.h"
 #include "services/ui/common/event_matcher_util.h"
 #include "services/ui/public/cpp/gpu_service.h"
 #include "services/ui/public/cpp/window.h"
@@ skipping 124 matching lines @@
   const size_t kMaxNumberThreads = 3u;  // Matches that of content.
   const char kThreadNamePrefix[] = "MashBlocking";
   blocking_pool_ = new base::SequencedWorkerPool(
       kMaxNumberThreads, kThreadNamePrefix, base::TaskPriority::USER_VISIBLE);
   InitWindowManager(std::move(window_tree_client), blocking_pool_);
 }
 
 bool WindowManagerApplication::OnConnect(const shell::Identity& remote_identity,
                                          shell::InterfaceRegistry* registry) {
   registry->AddInterface<ash::mojom::ShelfController>(this);
+  registry->AddInterface<ash::mojom::SystemTray>(this);
   registry->AddInterface<ash::mojom::WallpaperController>(this);
   registry->AddInterface<ui::mojom::AcceleratorRegistrar>(this);
   if (remote_identity.name() == "mojo:mash_session") {
     connector()->ConnectToInterface(remote_identity, &session_);
     session_->AddScreenlockStateListener(
         screenlock_state_listener_binding_.CreateInterfacePtrAndBind());
   }
   return true;
 }
 
 void WindowManagerApplication::Create(
     const shell::Identity& remote_identity,
     ash::mojom::ShelfControllerRequest request) {
   ash::mojom::ShelfController* shelf_controller =
       static_cast<ShelfDelegateMus*>(WmShell::Get()->shelf_delegate());
   DCHECK(shelf_controller);
   shelf_controller_bindings_.AddBinding(shelf_controller, std::move(request));
 }
 
+void WindowManagerApplication::Create(const shell::Identity& remote_identity,
+                                      ash::mojom::SystemTrayRequest request) {
+  ash::mojom::SystemTray* system_tray = static_cast<SystemTrayDelegateMus*>(

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

This cast makes me nervous. Could you cache the SystemTrayDelegateMus one some
where so you don't need the cast?

[James Cook, 2016/09/20 01:52:11]

How's this? I looked at caching the pointer, but it's pretty awkward.
ShellDelegateMus creates it. But ShellDelegateMus is stored as-a ShellDelegate
in WmShell. So I'd have to cache a ShellDelegateMus* in WmShellMus. WmShellMus's
constructor looks like this:

WmShellMus::WmShellMus(unique_ptr<ShellDelegate> delegate)
  : WmShell(std::move(delegate)) {}

I could change |delegate| to ShellDelegateMus* and cache it and take ownership,
but then we lose unique_ptr as a sign of ownership transfer. Or I could pass
both a unique_ptr and a raw pointer, which is just bizarre. Or I could cast
WmShell::delegate() to a ShellDelegateMus... which is a static_cast<> again.
Yuck.

+      WmShell::Get()->system_tray_delegate());
+  DCHECK(system_tray);
+  system_tray_bindings_.AddBinding(system_tray, std::move(request));
+}
+
 void WindowManagerApplication::Create(
     const ::shell::Identity& remote_identity,
     ash::mojom::WallpaperControllerRequest request) {
   ash::mojom::WallpaperController* wallpaper_controller =
       static_cast<WallpaperDelegateMus*>(WmShell::Get()->wallpaper_delegate());
   DCHECK(wallpaper_controller);
   wallpaper_controller_bindings_.AddBinding(wallpaper_controller,
                                             std::move(request));
 }
 
@@ skipping 15 matching lines @@
       base::Bind(&WindowManagerApplication::OnAcceleratorRegistrarDestroyed,
                  base::Unretained(this))));
 }
 
 void WindowManagerApplication::ScreenlockStateChanged(bool locked) {
   window_manager_->SetScreenLocked(locked);
 }
 
 }  // namespace mus
 }  // namespace ash