Incorporate comments in Dbus code and add Eol icon

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>
 
@@ skipping 56 matching lines @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/webui/chromeos/image_source.h"
 #include "chrome/browser/ui/webui/help/help_utils_chromeos.h"
 #include "chrome/browser/ui/webui/help/version_updater_chromeos.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/power_manager_client.h"
 #include "chromeos/system/statistics_provider.h"
 #include "components/prefs/pref_service.h"
 #include "components/user_manager/user_manager.h"
-#include "third_party/cros_system_api/dbus/update_engine/dbus-constants.h"
 #endif
 
 using base::ListValue;
 using content::BrowserThread;
 
 namespace {
 
 #if defined(OS_CHROMEOS)
 
 // Directory containing the regulatory labels for supported regions.
@@ skipping 113 matching lines @@
   text_path = text_path.Append(path);
   text_path = text_path.AppendASCII(kRegulatoryLabelTextFilename);
 
   std::string contents;
   if (base::ReadFileToString(text_path, &contents))
     return contents;
   return std::string();
 }
 
 // Returns messages that applys to this eol status
-base::string16 GetEolMessage(int status) {
+base::string16 GetEolMessage(update_engine::EndOfLifeStatus status) {
   if (status == update_engine::EndOfLifeStatus::kSecurityOnly) {
-    return l10n_util::GetStringFUTF16(
-        IDS_ABOUT_PAGE_EOL_SECURITY_ONLY,
-        base::ASCIIToUTF16(chrome::kEolNotificationURL));
+    return l10n_util::GetStringUTF16(IDS_ABOUT_PAGE_EOL_SECURITY_ONLY);
 
   } else {
-    return l10n_util::GetStringFUTF16(
-        IDS_ABOUT_PAGE_EOL_EOL,
-        base::ASCIIToUTF16(chrome::kEolNotificationURL));
+    return l10n_util::GetStringUTF16(IDS_ABOUT_PAGE_EOL_EOL);
   }
 }
 
 #endif  // defined(OS_CHROMEOS)
 
 }  // namespace
 
 HelpHandler::HelpHandler()
     : policy_registrar_(
         g_browser_process->policy_service(),
@@ skipping 134 matching lines @@
   localized_strings->SetString(
       "channelChangePageUnstableMessage",
       l10n_util::GetStringFUTF16(
           IDS_ABOUT_PAGE_CHANNEL_CHANGE_PAGE_UNSTABLE_MESSAGE,
           product_name));
 
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           chromeos::switches::kDisableNewChannelSwitcherUI)) {
     localized_strings->SetBoolean("disableNewChannelSwitcherUI", true);
   }
+
+  localized_strings->SetString(
+      "eolLearnMore", l10n_util::GetStringFUTF16(
+                          IDS_ABOUT_PAGE_EOL_LEARN_MORE,
+                          base::ASCIIToUTF16(chrome::kEolNotificationURL)));
 #endif
 
   base::string16 tos = l10n_util::GetStringFUTF16(
       IDS_ABOUT_TERMS_OF_SERVICE, base::UTF8ToUTF16(chrome::kChromeUITermsURL));
   localized_strings->SetString("productTOS", tos);
 
   localized_strings->SetString("webkitVersion", content::GetWebKitVersion());
 
   localized_strings->SetString("jsEngine", "V8");
   localized_strings->SetString("jsEngineVersion", v8::V8::GetVersion());
@@ skipping 140 matching lines @@
       "help.HelpPage.updateIsEnterpriseManaged",
       base::FundamentalValue(IsEnterpriseManaged()));
   // First argument to GetChannel() is a flag that indicates whether
   // current channel should be returned (if true) or target channel
   // (otherwise).
   version_updater_->GetChannel(true,
       base::Bind(&HelpHandler::OnCurrentChannel, weak_factory_.GetWeakPtr()));
   version_updater_->GetChannel(false,
       base::Bind(&HelpHandler::OnTargetChannel, weak_factory_.GetWeakPtr()));
 
-  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-          chromeos::switches::kEnableEolNotification)) {
+  if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
+          chromeos::switches::kDisableEolNotification)) {
     version_updater_->GetEolStatus(
         base::Bind(&HelpHandler::OnEolStatus, weak_factory_.GetWeakPtr()));
   }
 
   base::PostTaskAndReplyWithResult(
       content::BrowserThread::GetBlockingPool(),
       FROM_HERE,
       base::Bind(&FindRegulatoryLabelDir),
       base::Bind(&HelpHandler::OnRegulatoryLabelDirFound,
                  weak_factory_.GetWeakPtr()));
@@ skipping 210 matching lines @@
                                          base::StringValue(url));
 }
 
 void HelpHandler::OnRegulatoryLabelTextRead(const std::string& text) {
   // Remove unnecessary whitespace.
   web_ui()->CallJavascriptFunctionUnsafe(
       "help.HelpPage.setRegulatoryLabelText",
       base::StringValue(base::CollapseWhitespaceASCII(text, true)));
 }
 
-void HelpHandler::OnEolStatus(const int status) {
+void HelpHandler::OnEolStatus(update_engine::EndOfLifeStatus status) {
   if (status == update_engine::EndOfLifeStatus::kSupported ||
       IsEnterpriseManaged()) {
     return;
   }
 
   if (status == update_engine::EndOfLifeStatus::kSupported) {
     web_ui()->CallJavascriptFunctionUnsafe(
         "help.HelpPage.updateEolMessage", base::StringValue("device_supported"),
         base::StringValue(""));
   } else {
     base::string16 message = GetEolMessage(status);
     web_ui()->CallJavascriptFunctionUnsafe(
         "help.HelpPage.updateEolMessage", base::StringValue("device_endoflife"),
         base::StringValue(message));
   }
 }
 
 #endif  // defined(OS_CHROMEOS)