Connect Login UI to SystemTray

ash/common/system/tray/system_tray_controller.cc

 // Copyright 2016 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/common/system/tray/system_tray_controller.h"
 
 #include "ash/common/system/tray/system_tray.h"
 #include "ash/common/system/tray/system_tray_notifier.h"
 #include "ash/common/system/update/tray_update.h"
 #include "ash/common/wm_root_window_controller.h"
@@ skipping 109 matching lines @@
 }
 
 void SystemTrayController::BindRequest(mojom::SystemTrayRequest request) {
   bindings_.AddBinding(this, std::move(request));
 }
 
 void SystemTrayController::SetClient(mojom::SystemTrayClientPtr client) {
   system_tray_client_ = std::move(client);
 }
 
+void SystemTrayController::SetPrimaryTrayEnabled(bool enabled) {
+  ash::SystemTray* tray =

[James Cook, 2017/01/09 19:30:05]

nit: no ash::, here and below

[jonross, 2017/01/09 22:01:35]

Sadly they are, compiler incorrectly tries to link vs mojom::SystemTray, so the
specificity is needed here.

+      WmShell::Get()->GetPrimaryRootWindowController()->GetSystemTray();
+  if (!tray)
+    return;
+
+  // We disable the UI to prevent user from interracting with UI elements,

[James Cook, 2017/01/09 19:30:05]

nit: not your fault, but "interacting" here and "particularly" below

[jonross, 2017/01/09 22:01:35]

I'm used to making these comment typos myself!

WTB spell check for comments....

+  // particullary with the system tray menu. However, in case if the system tray
+  // bubble is opened at this point, it remains opened and interactive even
+  // after SystemTray::SetEnabled(false) call, which can be dangerous
+  // (http://crbug.com/497080). Close the menu to fix it. Calling
+  // SystemTray::SetEnabled(false) guarantees, that the menu will not be opened
+  // until the UI is enabled again.
+  if (!enabled && tray->HasSystemBubble())
+    tray->CloseSystemBubble();
+
+  tray->SetEnabled(enabled);
+}
+
+void SystemTrayController::SetPrimaryTrayVisible(bool visible) {
+  ash::SystemTray* tray =
+      WmShell::Get()->GetPrimaryRootWindowController()->GetSystemTray();
+  if (!tray)
+    return;
+
+  tray->SetVisible(visible);
+  tray->GetWidget()->SetOpacity(visible ? 1.0 : 0.0);

[James Cook, 2017/01/09 19:30:05]

nit: 1.f and 0.f since the call takes floats

[jonross, 2017/01/09 22:01:35]

Done.

+  if (visible) {
+    tray->GetWidget()->Show();
+  } else {
+    tray->GetWidget()->Hide();
+  }
+}
+
 void SystemTrayController::SetUse24HourClock(bool use_24_hour) {
   hour_clock_type_ = use_24_hour ? base::k24HourClock : base::k12HourClock;
   WmShell::Get()->system_tray_notifier()->NotifyDateFormatChanged();
 }
 
 void SystemTrayController::ShowUpdateIcon(mojom::UpdateSeverity severity,
                                           bool factory_reset_required) {
   // Show the icon on all displays.
   for (WmWindow* root : WmShell::Get()->GetAllRootWindows()) {
     ash::SystemTray* tray = root->GetRootWindowController()->GetSystemTray();
     // External monitors might not have a tray yet.
     if (!tray)
       continue;
     tray->tray_update()->ShowUpdateIcon(severity, factory_reset_required);
   }
 }
 
 }  // namespace ash