MD Settings: About page, porting C++ handler and adding browser proxy.

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

-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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_HELP_HELP_HANDLER_H_
-#define CHROME_BROWSER_UI_WEBUI_HELP_HELP_HANDLER_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_SETTINGS_ABOUT_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_SETTINGS_ABOUT_HANDLER_H_
 
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/string16.h"
 #include "build/build_config.h"
 #include "chrome/browser/ui/webui/help/version_updater.h"
+#include "chrome/browser/ui/webui/settings/settings_page_ui_handler.h"
 #include "components/policy/core/common/policy_service.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/web_ui_message_handler.h"
 
 #if defined(OS_CHROMEOS)
 #include "base/task/cancelable_task_tracker.h"
 #include "chromeos/system/version_loader.h"
 #endif  // defined(OS_CHROMEOS)
 
 namespace base {
 class DictionaryValue;
 class FilePath;
 class ListValue;
 }
 
+namespace content {
+class WebUIDataSource;
+}
+
+class Profile;
+
+namespace settings {
+
 // WebUI message handler for the help page.
-class HelpHandler : public content::WebUIMessageHandler,
-                    public content::NotificationObserver {
+class AboutHandler : public settings::SettingsPageUIHandler,

[tommycli, 2016/05/10 20:45:40]

This could use a unit test. I see that the original does not have one either.
This can also be deferred.

[dpapad, 2016/05/10 22:03:02]

Acknowledged. I prefer to first make progress on the UI side and add JS tests.
This will enusre that the C++/JS interface has been stabilized and therefore C++
tests can be added at that point.

[tommycli, 2016/05/10 22:14:52]

SGTM

+                     public content::NotificationObserver {
  public:
-  HelpHandler();
-  ~HelpHandler() override;
+  AboutHandler();
+  ~AboutHandler() override;
+
+  static AboutHandler* Create(content::WebUIDataSource* html_source,
+                              Profile* profile);
 
   // WebUIMessageHandler implementation.
   void RegisterMessages() override;
 
-  // Adds string values for the UI to |localized_strings|.
-  static void GetLocalizedValues(base::DictionaryValue* localized_strings);
-
   // NotificationObserver implementation.
   void Observe(int type,
                const content::NotificationSource& source,
                const content::NotificationDetails& details) override;
 
   // Returns the browser version as a string.
   static base::string16 BuildBrowserVersionString();
 
  private:
   void OnDeviceAutoUpdatePolicyChanged(const base::Value* previous_policy,
                                        const base::Value* current_policy);
 
   // On ChromeOS, this gets the current update status. On other platforms, it
   // will request and perform an update (if one is available).
-  void RefreshUpdateStatus();
-
-  // Initializes querying values for the page.
-  void OnPageLoaded(const base::ListValue* args);
+  void HandleRefreshUpdateStatus(const base::ListValue* args);
 
 #if defined(OS_MACOSX)
   // Promotes the updater for all users.
   void PromoteUpdater(const base::ListValue* args);
 #endif
 
   // Relaunches the browser. |args| must be empty.
-  void RelaunchNow(const base::ListValue* args);
+  void HandleRelaunchNow(const base::ListValue* args);
 
   // Opens the feedback dialog. |args| must be empty.
-  void OpenFeedbackDialog(const base::ListValue* args);
+  void HandleOpenFeedbackDialog(const base::ListValue* args);
 
   // Opens the help page. |args| must be empty.
-  void OpenHelpPage(const base::ListValue* args);
+  void HandleOpenHelpPage(const base::ListValue* args);
 
 #if defined(OS_CHROMEOS)
   // Sets the release track version.
   void SetChannel(const base::ListValue* args);

[tommycli, 2016/05/10 20:45:40]

Can we rename this to HandleSetChannel?

[dpapad, 2016/05/10 22:03:02]

Done.

 
-  // Performs relaunch and powerwash.
-  void RelaunchAndPowerwash(const base::ListValue* args);
+  // Checks for and applies update, triggered by JS.
+  void HandleRequestUpdate(const base::ListValue* args);
+
+  void HandleGetOsVersion(const base::ListValue* args);
+  void HandleGetArcVersion(const base::ListValue* args);
+  void HandleGetOsFirmware(const base::ListValue* args);
+  // C++ callback for either of |HandleGetOsVersion|, |HandleGetArcVersion|,
+  // |HandleGetOsFirmware|.
+  void OnVersionReady(std::string callback_id, std::string version);
+
+  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);
 #endif
 
   // Checks for and applies update.
-  void RequestUpdate(const base::ListValue* args);
+  void RequestUpdate();
 
   // Callback method which forwards status updates to the page.
   void SetUpdateStatus(VersionUpdater::Status status,
                        int progress,
                        const base::string16& fail_message);
 
 #if defined(OS_MACOSX)
   // Callback method which forwards promotion state to the page.
   void SetPromotionState(VersionUpdater::PromotionState state);
 #endif
 
 #if defined(OS_CHROMEOS)
-  // Callbacks from VersionLoader.
-  void OnOSVersion(const std::string& version);
-  void OnARCVersion(const std::string& firmware);
-  void OnOSFirmware(const std::string& firmware);
-  void OnCurrentChannel(const std::string& channel);
-  void OnTargetChannel(const std::string& channel);
+  void HandleGetRegulatoryInfo(const base::ListValue* args);
 
   // Callback for when the directory with the regulatory label image and alt
   // text has been found.
-  void OnRegulatoryLabelDirFound(const base::FilePath& path);
+  void OnRegulatoryLabelDirFound(std::string callback_id,
+                                 const base::FilePath& path);
 
-  // Callback for setting the regulatory label source.
-  void OnRegulatoryLabelImageFound(const base::FilePath& path);
-
-  // Callback for setting the regulatory label alt text.
-  void OnRegulatoryLabelTextRead(const std::string& text);
+  // Callback for when the regulatory text has been read.
+  void OnRegulatoryLabelTextRead(std::string callback_id,
+                                 const base::FilePath& path,
+                                 const std::string& text);
 #endif
 
   // Specialized instance of the VersionUpdater used to update the browser.
   std::unique_ptr<VersionUpdater> version_updater_;
 
   // Used to observe notifications.
   content::NotificationRegistrar registrar_;
 
   // Used to observe changes in the |kDeviceAutoUpdateDisabled| policy.
   policy::PolicyChangeRegistrar policy_registrar_;
 
   // Used for callbacks.
-  base::WeakPtrFactory<HelpHandler> weak_factory_;
+  base::WeakPtrFactory<AboutHandler> weak_factory_;
 
-  DISALLOW_COPY_AND_ASSIGN(HelpHandler);
+  DISALLOW_COPY_AND_ASSIGN(AboutHandler);
 };
 
-#endif  // CHROME_BROWSER_UI_WEBUI_HELP_HELP_HANDLER_H_
+}  // namespace settings
+
+#endif  // CHROME_BROWSER_UI_WEBUI_SETTINGS_ABOUT_HANDLER_H_