cros: Use SessionController to enable system tray settings / notifications tray

ash/system/screen_layout_observer.cc

 // Copyright (c) 2012 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/system/screen_layout_observer.h"
 
 #include <memory>
 #include <utility>
 #include <vector>
 
 #include "ash/display/screen_orientation_controller_chromeos.h"
 #include "ash/metrics/user_metrics_action.h"
 #include "ash/resources/grit/ash_resources.h"
+#include "ash/session/session_controller.h"
 #include "ash/shell.h"
 #include "ash/shell_port.h"
 #include "ash/strings/grit/ash_strings.h"
 #include "ash/system/devicetype_utils.h"
 #include "ash/system/system_notifier.h"
 #include "ash/system/tray/fixed_sized_image_view.h"
 #include "ash/system/tray/system_tray_controller.h"
-#include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/tray_constants.h"
 #include "base/bind.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/display/display.h"
 #include "ui/display/manager/display_manager.h"
 #include "ui/display/types/display_constants.h"
 #include "ui/message_center/message_center.h"
@@ skipping 25 matching lines @@
   // to empty string if this happens on release build.
   bool mirroring = display_manager->mirroring_display_id() == display_id;
   DCHECK(!mirroring);
   if (mirroring)
     return base::string16();
 
   DCHECK(display->is_valid());
   return base::UTF8ToUTF16(display->size().ToString());
 }
 
-// Attempts to open the display settings, returns true if successful.
-bool OpenSettings() {
-  // switch is intentionally introduced without default, to cause an error when
-  // a new type of login status is introduced.
-  switch (Shell::Get()->system_tray_delegate()->GetUserLoginStatus()) {
-    case LoginStatus::NOT_LOGGED_IN:
-    case LoginStatus::LOCKED:
-      return false;
-
-    case LoginStatus::USER:
-    case LoginStatus::OWNER:
-    case LoginStatus::GUEST:
-    case LoginStatus::PUBLIC:
-    case LoginStatus::SUPERVISED:
-    case LoginStatus::KIOSK_APP:
-    case LoginStatus::ARC_KIOSK_APP:
-      SystemTrayDelegate* delegate = Shell::Get()->system_tray_delegate();
-      if (delegate->ShouldShowSettings()) {
-        Shell::Get()->system_tray_controller()->ShowDisplaySettings();
-        return true;
-      }
-      break;
-  }
-
-  return false;
-}
-
 // Callback to handle a user selecting the notification view.
 void OpenSettingsFromNotification() {
   ShellPort::Get()->RecordUserMetricsAction(
       UMA_STATUS_AREA_DISPLAY_NOTIFICATION_SELECTED);
-  if (OpenSettings()) {
+  // Settings may be blocked, e.g. at the lock screen.
+  if (Shell::Get()->session_controller()->ShouldEnableSettings()) {
+    Shell::Get()->system_tray_controller()->ShowDisplaySettings();
     ShellPort::Get()->RecordUserMetricsAction(
         UMA_STATUS_AREA_DISPLAY_NOTIFICATION_SHOW_SETTINGS);
   }
 }
 
 // Returns the name of the currently connected external display whose ID is
 // |external_display_id|. This should not be used when the external display is
 // used for mirroring.
 base::string16 GetExternalDisplayName(int64_t external_display_id) {
   DCHECK(!display::Display::IsInternalDisplayId(external_display_id));
@@ skipping 306 matching lines @@
       return true;
 
     default:
       // Mirror mode was turned off; other messages should be shown e.g.
       // extended mode is on, ... etc.
       return false;
   }
 }
 
 }  // namespace ash