Revert of ash: Use system tray mojo interface to show system update tray icon

chrome/browser/ui/ash/system_tray_client.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 "chrome/browser/ui/ash/system_tray_client.h"
 
 #include "ash/common/login_status.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/wm_shell.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/shell.h"
 #include "base/logging.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_process_platform_part.h"
-#include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/accessibility/accessibility_util.h"
 #include "chrome/browser/chromeos/login/ui/login_display_host.h"
 #include "chrome/browser/chromeos/options/network_config_view.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/chromeos/set_time_dialog.h"
 #include "chrome/browser/chromeos/system/system_clock.h"
 #include "chrome/browser/chromeos/ui/choose_mobile_network_dialog.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/ash/ash_util.h"
 #include "chrome/browser/ui/ash/system_tray_delegate_chromeos.h"
 #include "chrome/browser/ui/chrome_pages.h"
 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h"
 #include "chrome/browser/ui/singleton_tabs.h"
-#include "chrome/browser/upgrade_detector.h"
 #include "chrome/common/url_constants.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/session_manager_client.h"
 #include "chromeos/login/login_state.h"
 #include "components/user_manager/user_manager.h"
-#include "content/public/browser/notification_service.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/common/service_manager_connection.h"
 #include "extensions/browser/api/vpn_provider/vpn_service.h"
 #include "extensions/browser/api/vpn_provider/vpn_service_factory.h"
 #include "net/base/escape.h"
 #include "services/service_manager/public/cpp/connector.h"
 #include "services/ui/public/cpp/property_type_converters.h"
 #include "services/ui/public/interfaces/window_manager.mojom.h"
 #include "third_party/cros_system_api/dbus/shill/dbus-constants.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/dialog_delegate.h"
 
 using chromeos::DBusThreadManager;
 using chromeos::LoginState;
 using views::Widget;
 
 namespace {
 
 const char kDisplaySettingsSubPageName[] = "display";
 const char kPaletteSettingsSubPageName[] = "stylus-overlay";
 
 SystemTrayClient* g_instance = nullptr;
 
 void ShowSettingsSubPageForActiveUser(const std::string& sub_page) {
   chrome::ShowSettingsSubPageForProfile(ProfileManager::GetActiveUserProfile(),
                                         sub_page);
 }
 
-// Returns the severity of a pending Chrome / Chrome OS update.
-ash::mojom::UpdateSeverity GetUpdateSeverity(UpgradeDetector* detector) {
-  switch (detector->upgrade_notification_stage()) {
-    case UpgradeDetector::UPGRADE_ANNOYANCE_NONE:
-      return ash::mojom::UpdateSeverity::NONE;
-    case UpgradeDetector::UPGRADE_ANNOYANCE_LOW:
-      return ash::mojom::UpdateSeverity::LOW;
-    case UpgradeDetector::UPGRADE_ANNOYANCE_ELEVATED:
-      return ash::mojom::UpdateSeverity::ELEVATED;
-    case UpgradeDetector::UPGRADE_ANNOYANCE_HIGH:
-      return ash::mojom::UpdateSeverity::HIGH;
-    case UpgradeDetector::UPGRADE_ANNOYANCE_SEVERE:
-      return ash::mojom::UpdateSeverity::SEVERE;
-    case UpgradeDetector::UPGRADE_ANNOYANCE_CRITICAL:
-      return ash::mojom::UpdateSeverity::CRITICAL;
-  }
-  NOTREACHED();
-  return ash::mojom::UpdateSeverity::CRITICAL;
-}
-
 }  // namespace
 
 SystemTrayClient::SystemTrayClient() : binding_(this) {
   content::ServiceManagerConnection::GetForProcess()
       ->GetConnector()
       ->ConnectToInterface(ash_util::GetAshServiceName(), &system_tray_);
   // Register this object as the client interface implementation.
   system_tray_->SetClient(binding_.CreateInterfacePtrAndBind());
 
   // If this observes clock setting changes before ash comes up the IPCs will
   // be queued on |system_tray_|.
   g_browser_process->platform_part()->GetSystemClock()->AddObserver(this);
 
-  registrar_.Add(this, chrome::NOTIFICATION_UPGRADE_RECOMMENDED,
-                 content::NotificationService::AllSources());
-
-  // If an upgrade is available at startup then tell ash about it.
-  if (UpgradeDetector::GetInstance()->notify_upgrade())
-    HandleUpdateAvailable();
-
   DCHECK(!g_instance);
   g_instance = this;
 }
 
 SystemTrayClient::~SystemTrayClient() {
   DCHECK_EQ(this, g_instance);
   g_instance = nullptr;
 
   g_browser_process->platform_part()->GetSystemClock()->RemoveObserver(this);
 }
@@ skipping 75 matching lines @@
         mojo::ConvertTo<std::vector<uint8_t>>(container_id);
   } else {
     params.parent = ash::Shell::GetContainer(ash::Shell::GetPrimaryRootWindow(),
                                              container_id);
   }
   Widget* widget = new Widget;  // Owned by native widget.
   widget->Init(params);
   return widget;
 }
 
-void SystemTrayClient::SetFlashUpdateAvailable() {
-  flash_update_available_ = true;
-  HandleUpdateAvailable();
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // ash::mojom::SystemTrayClient:
 
 void SystemTrayClient::ShowSettings() {
   ShowSettingsSubPageForActiveUser(std::string());
 }
 
 void SystemTrayClient::ShowDateSettings() {
   content::RecordAction(base::UserMetricsAction("ShowDateOptions"));
   // Everybody can change the time zone (even though it is a device setting).
@@ skipping 122 matching lines @@
   CHECK(!login_state->IsUserLoggedIn() ||
         login_state->GetLoggedInUserType() == LoginState::LOGGED_IN_USER_NONE);
   chromeos::LoginDisplayHost::default_host()->OpenProxySettings();
 }
 
 void SystemTrayClient::SignOut() {
   chrome::AttemptUserExit();
 }
 
 void SystemTrayClient::RequestRestartForUpdate() {
-  // Flash updates on Chrome OS require device reboot.
-  const chrome::RebootPolicy reboot_policy =
-      flash_update_available_ ? chrome::RebootPolicy::kForceReboot
-                              : chrome::RebootPolicy::kOptionalReboot;
+  bool component_update = false;
+  chromeos::SystemTrayDelegateChromeOS* tray =
+      chromeos::SystemTrayDelegateChromeOS::instance();
+  if (tray)
+    component_update = tray->GetFlashUpdateAvailable();
+
+  chrome::RebootPolicy reboot_policy =
+      component_update ? chrome::RebootPolicy::kForceReboot
+                       : chrome::RebootPolicy::kOptionalReboot;
 
   chrome::NotifyAndTerminate(true /* fast_path */, reboot_policy);
 }
 
-void SystemTrayClient::HandleUpdateAvailable() {
-  // Show an update icon for Chrome updates and Flash component updates.
-  UpgradeDetector* detector = UpgradeDetector::GetInstance();
-  DCHECK(detector->notify_upgrade() || flash_update_available_);
-
-  // Get the Chrome update severity.
-  ash::mojom::UpdateSeverity severity = GetUpdateSeverity(detector);
-
-  // Flash updates are elevated severity unless the Chrome severity is higher.
-  if (flash_update_available_)
-    severity = std::max(severity, ash::mojom::UpdateSeverity::ELEVATED);
-
-  system_tray_->ShowUpdateIcon(severity, detector->is_factory_reset_required());
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // chromeos::system::SystemClockObserver:
 
 void SystemTrayClient::OnSystemClockChanged(
     chromeos::system::SystemClock* clock) {
   system_tray_->SetUse24HourClock(clock->ShouldUse24HourClock());
 }
-
-void SystemTrayClient::Observe(int type,
-                               const content::NotificationSource& source,
-                               const content::NotificationDetails& details) {
-  DCHECK_EQ(chrome::NOTIFICATION_UPGRADE_RECOMMENDED, type);
-  HandleUpdateAvailable();
-}