mustash: Show networking items in ash system tray

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"
 #include "services/ui/public/cpp/window_tree_client.h"
 #include "ui/aura/env.h"
 #include "ui/events/event.h"
 #include "ui/message_center/message_center.h"
 #include "ui/views/mus/aura_init.h"
 #include "ui/views/mus/surface_context_factory.h"
 
 #if defined(OS_CHROMEOS)
 #include "ash/common/system/chromeos/power/power_status.h"
+#include "ash/mus/system_tray_delegate_mus.h"
 #include "chromeos/audio/cras_audio_handler.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
+#include "chromeos/network/network_handler.h"
 #include "chromeos/system/fake_statistics_provider.h"
 #include "device/bluetooth/dbus/bluez_dbus_manager.h"  // nogncheck
 #endif
 
 namespace ash {
 namespace mus {
 namespace {
 
 void InitializeComponents() {
   message_center::MessageCenter::Initialize();
 #if defined(OS_CHROMEOS)
   // Must occur after mojo::ApplicationRunner has initialized AtExitManager, but
   // before WindowManager::Init().
   chromeos::DBusThreadManager::Initialize(
       chromeos::DBusThreadManager::PROCESS_ASH);
 
   // See ChromeBrowserMainPartsChromeos for ordering details.
   bluez::BluezDBusManager::Initialize(
       chromeos::DBusThreadManager::Get()->GetSystemBus(),
       chromeos::DBusThreadManager::Get()->IsUsingFakes());
+  chromeos::NetworkHandler::Initialize();
   // TODO(jamescook): Initialize real audio handler.
   chromeos::CrasAudioHandler::InitializeForTesting();
   PowerStatus::Initialize();
 #endif
 }
 
 void ShutdownComponents() {
 #if defined(OS_CHROMEOS)
   PowerStatus::Shutdown();
   chromeos::CrasAudioHandler::Shutdown();
+  chromeos::NetworkHandler::Shutdown();
   bluez::BluezDBusManager::Shutdown();
   chromeos::DBusThreadManager::Shutdown();
 #endif
   message_center::MessageCenter::Shutdown();
 }
 
 }  // namespace
 
 WindowManagerApplication::WindowManagerApplication()
     : screenlock_state_listener_binding_(this) {}
@@ skipping 93 matching lines @@
 void WindowManagerApplication::Create(const shell::Identity& remote_identity,
                                       mojom::ShelfControllerRequest request) {
   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,
                                       mojom::SystemTrayRequest request) {
+#if defined(OS_CHROMEOS)
+  // Chrome-with-ash only runs on Chrome OS, so don't provide the SystemTray

[msw, 2016/09/29 16:54:52]

q: What about windows debugging?

[James Cook, 2016/09/29 17:05:10]

You can't debug system tray behavior on Windows today, other than what
DefaultSystemTrayDelegate provides.

If you would prefer, I could go back to lots of ifdefs in SystemTrayDelegateMus.
(I can't do the always-have-a-vpndelegate-member thing, as
~SystemTrayDelegateMus will attempt to destroy it, and I can't ifdef that part
out. So it's fairly ifdef-y. And I'm still pretty sure things will misbehave on
Windows, since SystemTrayClient doesn't exist there.)

Do you want me to hold off on landing this? I took it out of the CQ.

[msw, 2016/09/29 17:26:46]

Ah, using DefaultSystemTrayDelegate is fine; I thought this meant that we
wouldn't create any SystemTrayDelegate instance, but I was just wrong.

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