Display "Restart to update" dialog to Chrome OS users.

chrome/browser/ui/ash/system_tray_delegate_chromeos.cc

 // Copyright 2013 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_delegate_chromeos.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <set>
@@ skipping 95 matching lines @@
 namespace chromeos {
 
 namespace {
 
 // The minimum session length limit that can be set.
 const int kSessionLengthLimitMinMs = 30 * 1000;  // 30 seconds.
 
 // The maximum session length limit that can be set.
 const int kSessionLengthLimitMaxMs = 24 * 60 * 60 * 1000;  // 24 hours.
 
+// A pointer so that callers can access the single class instance.
+SystemTrayDelegateChromeOS* g_instance = nullptr;
+
 void ExtractIMEInfo(const input_method::InputMethodDescriptor& ime,
                     const input_method::InputMethodUtil& util,
                     ash::IMEInfo* info) {
   info->id = ime.id();
   info->name = util.GetInputMethodLongName(ime);
   info->medium_name = util.GetInputMethodMediumName(ime);
   info->short_name = util.GetInputMethodShortName(ime);
   info->third_party = extension_ime_util::IsExtensionIME(ime.id());
 }
 
@@ skipping 45 matching lines @@
                   chrome::NOTIFICATION_PROFILE_DESTROYED,
                   content::NotificationService::AllSources());
 
   AccessibilityManager* accessibility_manager = AccessibilityManager::Get();
   CHECK(accessibility_manager);
   accessibility_subscription_ = accessibility_manager->RegisterCallback(
       base::Bind(&SystemTrayDelegateChromeOS::OnAccessibilityStatusChanged,
                  base::Unretained(this)));
 
   user_manager::UserManager::Get()->AddSessionStateObserver(this);
+
+  g_instance = this;

[James Cook, 2016/11/17 00:43:43]

DCHECK(!g_instance) above just to make sure no one is instantiating two
instances

[Greg K, 2016/11/30 19:30:29]

Done.

 }
 
 void SystemTrayDelegateChromeOS::Initialize() {
   DBusThreadManager::Get()->GetSessionManagerClient()->AddObserver(this);
 
   input_method::InputMethodManager::Get()->AddObserver(this);
   input_method::InputMethodManager::Get()->AddImeMenuObserver(this);
   ui::ime::InputMethodMenuManager::GetInstance()->AddObserver(this);
 
   device::BluetoothAdapterFactory::GetAdapter(
@@ skipping 28 matching lines @@
 
   policy::BrowserPolicyConnectorChromeOS* policy_connector =
       g_browser_process->platform_part()->browser_policy_connector_chromeos();
   policy::DeviceCloudPolicyManagerChromeOS* policy_manager =
       policy_connector->GetDeviceCloudPolicyManager();
   if (policy_manager)
     policy_manager->core()->store()->AddObserver(this);
   UpdateEnterpriseDomain();
 }
 
 SystemTrayDelegateChromeOS::~SystemTrayDelegateChromeOS() {

[James Cook, 2016/11/17 00:43:43]

DCHECK_EQ(this, g_instance);
g_instance = nullptr;

[Greg K, 2016/11/30 19:30:30]

Done.

   // Unregister PrefChangeRegistrars.
   local_state_registrar_.reset();
   user_pref_registrar_.reset();
 
   // Unregister content notifications before destroying any components.
   registrar_.reset();
 
   // Unregister a11y status subscription.
   accessibility_subscription_.reset();
 
@@ skipping 73 matching lines @@
   return user && user->IsSupervised();
 }
 
 bool SystemTrayDelegateChromeOS::IsUserChild() const {
   return user_manager::UserManager::Get()->IsLoggedInAsChildUser();
 }
 
 void SystemTrayDelegateChromeOS::GetSystemUpdateInfo(
     ash::UpdateInfo* info) const {
   GetUpdateInfo(UpgradeDetector::GetInstance(), info);
+  if (!info->factory_reset_required && flash_update_available_)

[James Cook, 2016/11/17 00:43:43]

Any particular reason not to set update_required if factory_reset_required is
set?

[Greg K, 2016/11/30 19:30:30]

Done.

+    info->update_required = true;
 }
 
 bool SystemTrayDelegateChromeOS::ShouldShowSettings() const {
   // Show setting button only when the user flow allows and it's not in the
   // multi-profile login screen.
   return ChromeUserManager::Get()->GetCurrentUserFlow()->ShouldShowSettings() &&
          !IsSessionInSecondaryLoginScreen();
 }
 
 bool SystemTrayDelegateChromeOS::ShouldShowNotificationTray() const {
@@ skipping 675 matching lines @@
 
   LOG(WARNING) << "SystemTrayDelegateChromeOS::GetChildUserMessage call while "
                << "ENABLE_SUPERVISED_USERS undefined.";
   return base::string16();
 }
 
 ash::SystemTrayDelegate* CreateSystemTrayDelegate() {
   return new SystemTrayDelegateChromeOS();
 }
 
+// static
+SystemTrayDelegateChromeOS* SystemTrayDelegateChromeOS::Get() {
+  return g_instance;
+}
+
+void SystemTrayDelegateChromeOS::SetFlashUpdateAvailable() {
+  flash_update_available_ = true;
+
+  ash::UpdateInfo info;

[James Cook, 2016/11/17 00:43:43]

Why not call GetSystemUpdateInfo() and use that result?

That will make sure GetUpdateInfo() is always called, so if someone adds
something there then this won't break.

[Greg K, 2016/11/30 19:30:29]

Done.

+  info.severity = ash::UpdateInfo::UPDATE_ELEVATED;
+  info.update_required = true;
+  info.factory_reset_required = false;
+
+  GetSystemTrayNotifier()->NotifyUpdateRecommended(info);
+}

[James Cook, 2016/11/17 00:43:43]

Can you add a test for this? It's unlikely that flash updates are going to get
tested very often by QA. I would suggest adding something to the browser test
(the unit test seems to have a flake problem you probably don't want to deal
with). I think there is a GetTrayUpdateForTest() method in ash you can use to
check if the update icon actually appears.

[Greg K, 2016/11/30 19:30:30]

What do you mean by "has a flake problem"? I imagine the unit test is simplest.
Otherwise can you point me to which browsertest to add this too?

[James Cook, 2016/11/30 23:01:40]

A unit test would be nice, but if you look at
system_tray_delegate_chromeos_unittest.cc you'll see a single unit test that is
disabled for flakiness. I suspect any attempt to create a
SystemTrayDelegateChromeOS will trigger the same flake.

https://cs.chromium.org/chromium/src/chrome/browser/ui/ash/system_tray_delega...

I would add a test to
https://cs.chromium.org/chromium/src/chrome/browser/ui/ash/system_tray_delega...

+
 }  // namespace chromeos