Settings: About: Fix cros channel info.

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

 // 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.
 
 #ifndef CHROME_BROWSER_UI_WEBUI_SETTINGS_ABOUT_HANDLER_H_
 #define CHROME_BROWSER_UI_WEBUI_SETTINGS_ABOUT_HANDLER_H_
 
 #include <memory>
 #include <string>
 
@@ skipping 73 matching lines @@
   // Opens the feedback dialog. |args| must be empty.
   void HandleOpenFeedbackDialog(const base::ListValue* args);
 
   // Opens the help page. |args| must be empty.
   void HandleOpenHelpPage(const base::ListValue* args);
 
 #if defined(OS_CHROMEOS)
   // 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.
   void RequestUpdate();
 
   // Callback method which forwards status updates to the page.
   void SetUpdateStatus(VersionUpdater::Status status,
                        int progress,
                        const base::string16& fail_message);
 
@@ skipping 27 matching lines @@
 
   // Used for callbacks.
   base::WeakPtrFactory<AboutHandler> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(AboutHandler);
 };
 
 }  // namespace settings
 
 #endif  // CHROME_BROWSER_UI_WEBUI_SETTINGS_ABOUT_HANDLER_H_