Add update available icon in system tray

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/login_status.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/public/interfaces/constants.mojom.h"
 #include "ash/shell.h"
 #include "base/feature_list.h"
 #include "base/logging.h"
+#include "base/memory/weak_ptr.h"
 #include "base/metrics/user_metrics.h"
+#include "base/single_thread_task_runner.h"
+#include "base/threading/thread_task_runner_handle.h"
+#include "base/time/time.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/bluetooth/bluetooth_pairing_dialog.h"
 #include "chrome/browser/chromeos/login/help_app_launcher.h"
 #include "chrome/browser/chromeos/login/ui/login_display_host.h"
 #include "chrome/browser/chromeos/options/network_config_view.h"
 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h"
@@ skipping 30 matching lines @@
 #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::BluetoothPairingDialog;
 using chromeos::DBusThreadManager;
 using chromeos::LoginState;
+using chromeos::UpdateEngineClient;
 using device::BluetoothDevice;
 using views::Widget;
 
 namespace {
 
 SystemTrayClient* g_instance = nullptr;
 
 void ShowSettingsSubPageForActiveUser(const std::string& sub_page) {
   chrome::ShowSettingsSubPageForProfile(ProfileManager::GetActiveUserProfile(),
                                         sub_page);
@@ skipping 27 matching lines @@
       ->BindInterface(ash::mojom::kServiceName, &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());
+  registrar_.Add(this, chrome::NOTIFICATION_UPDATE_OVER_CELLULAR_AVAILABLE,
+                 content::NotificationService::AllSources());
 
   // If an upgrade is available at startup then tell ash about it.
   if (UpgradeDetector::GetInstance()->notify_upgrade())
     HandleUpdateAvailable();
 
   // If the device is enterprise managed then send ash the enterprise domain.
   policy::BrowserPolicyConnectorChromeOS* policy_connector =
       g_browser_process->platform_part()->browser_policy_connector_chromeos();
   policy::DeviceCloudPolicyManagerChromeOS* policy_manager =
       policy_connector->GetDeviceCloudPolicyManager();
@@ skipping 50 matching lines @@
       return ash::LoginStatus::SUPERVISED;
     case LoginState::LOGGED_IN_USER_KIOSK_APP:
       return ash::LoginStatus::KIOSK_APP;
     case LoginState::LOGGED_IN_USER_ARC_KIOSK_APP:
       return ash::LoginStatus::ARC_KIOSK_APP;
   }
   NOTREACHED();
   return ash::LoginStatus::NOT_LOGGED_IN;
 }
 
+void SystemTrayClient::ScheduleRequestUpdateCheck() {
+  base::WeakPtrFactory<SystemTrayClient> weak_ptr_factory_(this);
+  base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
+      FROM_HERE,
+      base::Bind(&SystemTrayClient::RequestUpdateCheck, base::Unretained(this)),
+      // Waits 1 second until after the about Chrome OS
+      // page is loaded.

[stevenjb, 2017/05/16 19:49:06]

What are we delaying this? Please explain. (Also combine comment lines)

[weidongg, 2017/05/16 19:58:36]

Clicking this icon will bring user to About Chrome OS page
and show an update warning dialog above the page.
But that dialog is only triggered when the page receives signal from update
engine. The signal is broadcasted after RequestUpdateCheck() is called.
So the sequence should be:
About Chrome OS page is loaded completely -> RequestUpdateCheck() is called ->
NEED_PERMISSION_TO_UPDATE is broadcasted by update engine -> About Chrome OS
page shows update warning dialog.

There's no callback when the page is completely loaded, so my solution is to
delay for a certain of time, but I am not sure whether 1 second is proper.

[stevenjb, 2017/05/16 20:42:34]

Using a time delay like this is fragile at best.

We should modify the page to take a parameter, e.g. request_update=true and have
the page request the update instead.

See internet_detail_page.js for an example where we use getQueryParameters() to
show show a configuration dialog.

[weidongg, 2017/05/17 00:27:23]

Yes, I was worried about the fragility too. Making the page take a parameter is
much better. Thanks.

+      base::TimeDelta::FromSeconds(1));
+}
+
+void SystemTrayClient::RequestUpdateCheck() {
+  base::WeakPtrFactory<SystemTrayClient> weak_ptr_factory_(this);
+  DBusThreadManager::Get()->GetUpdateEngineClient()->RequestUpdateCheck(
+      base::Bind(&SystemTrayClient::OnRequestUpdateCheck,
+                 weak_ptr_factory_.GetWeakPtr()));
+}
+
+void SystemTrayClient::OnRequestUpdateCheck(
+    UpdateEngineClient::UpdateCheckResult /* result */) {}
+
 // static
 int SystemTrayClient::GetDialogParentContainerId() {
   const ash::LoginStatus login_status = GetUserLoginStatus();
   if (login_status == ash::LoginStatus::NOT_LOGGED_IN ||
       login_status == ash::LoginStatus::LOCKED) {
     return ash::kShellWindowId_LockSystemModalContainer;
   }
 
   session_manager::SessionManager* const session_manager =
       session_manager::SessionManager::Get();
@@ skipping 71 matching lines @@
   dialog->ShowInContainer(GetDialogParentContainerId());
 }
 
 void SystemTrayClient::ShowDateSettings() {
   base::RecordAction(base::UserMetricsAction("ShowDateOptions"));
   // Everybody can change the time zone (even though it is a device setting).
   chrome::ShowSettingsSubPageForProfile(ProfileManager::GetActiveUserProfile(),
                                         chrome::kDateTimeSubPage);
 }
 
+void SystemTrayClient::ShowAboutChromeOS() {
+  ShowSettingsSubPageForActiveUser(chrome::kHelpSubPage);
+}
+
 void SystemTrayClient::ShowSetTimeDialog() {
   chromeos::SetTimeDialog::ShowDialogInContainer(GetDialogParentContainerId());
 }
 
 void SystemTrayClient::ShowDisplaySettings() {
   base::RecordAction(base::UserMetricsAction("ShowDisplayOptions"));
   ShowSettingsSubPageForActiveUser(chrome::kDisplaySubPage);
 }
 
 void SystemTrayClient::ShowPowerSettings() {
@@ skipping 171 matching lines @@
   // Show a string specific to updating flash player if there is no system
   // update.
   ash::mojom::UpdateType update_type = detector->notify_upgrade()
                                            ? ash::mojom::UpdateType::SYSTEM
                                            : ash::mojom::UpdateType::FLASH;
 
   system_tray_->ShowUpdateIcon(severity, detector->is_factory_reset_required(),
                                update_type);
 }
 
+void SystemTrayClient::HandleUpdateOverCellularAvailable() {
+  system_tray_->ShowUpdateOverCellularAvailableIcon();
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // 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();
+  if (chrome::NOTIFICATION_UPGRADE_RECOMMENDED == type)
+    HandleUpdateAvailable();
+  else if (chrome::NOTIFICATION_UPDATE_OVER_CELLULAR_AVAILABLE == type)
+    HandleUpdateOverCellularAvailable();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // policy::CloudPolicyStore::Observer
 void SystemTrayClient::OnStoreLoaded(policy::CloudPolicyStore* store) {
   UpdateEnterpriseDomain();
 }
 
 void SystemTrayClient::OnStoreError(policy::CloudPolicyStore* store) {
   UpdateEnterpriseDomain();
 }
 
 void SystemTrayClient::UpdateEnterpriseDomain() {
   policy::BrowserPolicyConnectorChromeOS* connector =
       g_browser_process->platform_part()->browser_policy_connector_chromeos();
   const std::string enterprise_domain = connector->GetEnterpriseDomain();
   const bool active_directory_managed = connector->IsActiveDirectoryManaged();
   if (enterprise_domain == last_enterprise_domain_ &&
       active_directory_managed == last_active_directory_managed_) {
     return;
   }
   // Send to ash, which will add an item to the system tray.
   system_tray_->SetEnterpriseDomain(enterprise_domain,
                                     active_directory_managed);
   last_enterprise_domain_ = enterprise_domain;
   last_active_directory_managed_ = active_directory_managed;
 }