Migrate upgrade notifications to observer

chrome/browser/ui/webui/help/help_handler.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 "chrome/browser/ui/webui/help/help_handler.h"
 
 #include <stddef.h>
 
 #include <string>
 
 #include "ash/system/devicetype_utils.h"
 #include "base/base_switches.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/i18n/message_formatter.h"
 #include "base/location.h"
 #include "base/macros.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/task_scheduler/post_task.h"
 #include "base/time/time.h"
 #include "base/values.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/obsolete_system/obsolete_system.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/chrome_pages.h"
+#include "chrome/browser/upgrade_detector.h"
 #include "chrome/common/channel_info.h"
 #include "chrome/common/chrome_content_client.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/google/core/browser/google_util.h"
 #include "components/policy/core/common/policy_namespace.h"
 #include "components/policy/policy_constants.h"
 #include "components/strings/grit/components_chromium_strings.h"
 #include "components/strings/grit/components_strings.h"
 #include "components/version_info/version_info.h"
 #include "content/public/browser/browser_thread.h"
-#include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "v8/include/v8-version-string.h"
 
 #if defined(OS_CHROMEOS)
 #include "base/files/file_util_proxy.h"
 #include "base/i18n/time_formatting.h"
 #include "base/sys_info.h"
 #include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h"
@@ skipping 140 matching lines @@
   if (base::ReadFileToString(text_path, &contents))
     return contents;
   return std::string();
 }
 #endif  // defined(OS_CHROMEOS)
 
 }  // namespace
 
 HelpHandler::HelpHandler()
     : policy_registrar_(
-        g_browser_process->policy_service(),
-        policy::PolicyNamespace(policy::POLICY_DOMAIN_CHROME, std::string())),
+          g_browser_process->policy_service(),
+          policy::PolicyNamespace(policy::POLICY_DOMAIN_CHROME, std::string())),
+      apply_changes_from_upgrade_observer_(false),
       weak_factory_(this) {
+  UpgradeDetector::GetInstance()->AddObserver(this);
 }
 
 HelpHandler::~HelpHandler() {
+  UpgradeDetector::GetInstance()->RemoveObserver(this);
 }
 
 void HelpHandler::GetLocalizedValues(base::DictionaryValue* localized_strings) {
   struct L10nResources {
     const char* name;
     int ids;
   };
 
   static L10nResources resources[] = {
     {"aboutTitle", IDS_ABOUT_TITLE},
@@ skipping 141 matching lines @@
 
   localized_strings->SetString("userAgentInfo", GetUserAgent());
 
   base::CommandLine::StringType command_line =
       base::CommandLine::ForCurrentProcess()->GetCommandLineString();
   localized_strings->SetString("commandLineInfo", command_line);
 }
 
 void HelpHandler::RegisterMessages() {
   version_updater_.reset(VersionUpdater::Create(web_ui()->GetWebContents()));
-  registrar_.Add(this, chrome::NOTIFICATION_UPGRADE_RECOMMENDED,
-                 content::NotificationService::AllSources());
+  apply_changes_from_upgrade_observer_ = true;
   policy_registrar_.Observe(
       policy::key::kDeviceAutoUpdateDisabled,
       base::Bind(&HelpHandler::OnDeviceAutoUpdatePolicyChanged,
                  base::Unretained(this)));
 
   web_ui()->RegisterMessageCallback("onPageLoaded",
       base::Bind(&HelpHandler::OnPageLoaded, base::Unretained(this)));
   web_ui()->RegisterMessageCallback("relaunchNow",
       base::Bind(&HelpHandler::RelaunchNow, base::Unretained(this)));
   web_ui()->RegisterMessageCallback("openFeedbackDialog",
@@ skipping 13 matching lines @@
       base::Bind(&HelpHandler::PromoteUpdater, base::Unretained(this)));
 #endif
 
 #if defined(OS_CHROMEOS)
   // Handler for the product label image, which will be shown if available.
   content::URLDataSource::Add(Profile::FromWebUI(web_ui()),
                               new chromeos::ImageSource());
 #endif
 }
 
-void HelpHandler::Observe(int type, const content::NotificationSource& source,
-                          const content::NotificationDetails& details) {
-  DCHECK_EQ(chrome::NOTIFICATION_UPGRADE_RECOMMENDED, type);
-
-  // A version update is installed and ready to go. Refresh the UI so the
-  // correct state will be shown.
-  RequestUpdate(nullptr);
+void HelpHandler::OnUpgradeRecommended() {
+  if (apply_changes_from_upgrade_observer_) {
+    // A version update is installed and ready to go. Refresh the UI so the
+    // correct state will be shown.
+    RequestUpdate(nullptr);
+  }
 }
 
 // static
 base::string16 HelpHandler::BuildBrowserVersionString() {
   std::string version = version_info::GetVersionNumber();
 
   std::string modifier = chrome::GetChannelString();
   if (!modifier.empty())
     version += " " + modifier;
 
@@ skipping 328 matching lines @@
                                            base::Value("device_supported"),
                                            base::Value(""));
   } else {
     web_ui()->CallJavascriptFunctionUnsafe(
         "help.HelpPage.updateEolMessage", base::Value("device_endoflife"),
         base::Value(l10n_util::GetStringUTF16(IDS_ABOUT_PAGE_EOL_EOL)));
   }
 }
 
 #endif  // defined(OS_CHROMEOS)