Settings: About: Fix cros channel info.

chrome/browser/ui/webui/settings/about_handler.h

Index: chrome/browser/ui/webui/settings/about_handler.h
diff --git a/chrome/browser/ui/webui/settings/about_handler.h b/chrome/browser/ui/webui/settings/about_handler.h
index 6f275d0fc8881fc83ed0f7408d9ebc65e00198a5..3de70b602ec35d17ddaccd6b69153c64135e8fa3 100644
--- a/chrome/browser/ui/webui/settings/about_handler.h
+++ b/chrome/browser/ui/webui/settings/about_handler.h
@@ -91,20 +91,24 @@ class AboutHandler : public settings::SettingsPageUIHandler,
   // Sets the release track version.
   void HandleSetChannel(const base::ListValue* args);
 
-  // Checks for and applies update, triggered by JS.
-  void HandleRequestUpdate(const base::ListValue* args);
-
   // Retrieves OS, ARC and firmware versions.
   void HandleGetVersionInfo(const base::ListValue* args);
   void OnGetVersionInfoReady(
       std::string callback_id,
       std::unique_ptr<base::DictionaryValue> version_info);
 
-  void HandleGetCurrentChannel(const base::ListValue* args);
-  void HandleGetTargetChannel(const base::ListValue* args);
-  // C++ callback for either of |HandleGetCurrentChannel| or
-  // |HandleGetTargetChannel|,
-  void OnGetChannelReady(std::string callback_id, const std::string& channel);
+  // Retrieves combined channel info.
+  void HandleGetChannelInfo(const base::ListValue* args);
+  // Callbacks for version_updater_->GetChannel calls.
+  void OnGetCurrentChannel(std::string callback_id,
+                           const std::string& current_channel);
+  void OnGetTargetChannel(std::string callback_id,
+                          const std::string& current_channel,
+                          const std::string& target_channel);
+
+  // Checks for and applies update, triggered by JS.
+  void HandleRequestUpdate(const base::ListValue* args);
+
 #endif
 
   // Checks for and applies update.