Settings: About: Fix cros channel info.

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

 // 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.
 
 #include "chrome/browser/ui/webui/settings/about_handler.h"
 
 #include <stddef.h>
 
 #include <string>
 
@@ skipping 280 matching lines @@
   base::string16 tos = l10n_util::GetStringFUTF16(
       IDS_ABOUT_TERMS_OF_SERVICE, base::UTF8ToUTF16(chrome::kChromeUITermsURL));
   html_source->AddString("aboutProductTos", tos);
 #endif
 
 #if defined(OS_CHROMEOS)
   base::string16 os_license = l10n_util::GetStringFUTF16(
       IDS_ABOUT_CROS_VERSION_LICENSE,
       base::ASCIIToUTF16(chrome::kChromeUIOSCreditsURL));
   html_source->AddString("aboutProductOsLicense", os_license);
-
-  html_source->AddBoolean("aboutCanChangeChannel", CanChangeChannel(profile));

[stevenjb, 2016/12/02 23:04:59]

The primary problem is that the result of CanChangeChannel is not accurate when
this is created, so we need to provide it via a query of some sort. (I checked
and none of the other properties set on Create appear to have that issue).

[dpapad, 2016/12/02 23:27:12]

I guess in the old C++ handler, we call CanChangeChannel() much later, see
"OnPageLoaded" at
https://cs.chromium.org/chromium/src/chrome/browser/ui/webui/help/help_handle....

   html_source->AddBoolean("aboutEnterpriseManaged", IsEnterpriseManaged());
 
   base::Time build_time = base::SysInfo::GetLsbReleaseTime();
   base::string16 build_date = base::TimeFormatFriendlyDate(build_time);
   html_source->AddString("aboutBuildDate", build_date);
 
   base::CommandLine::StringType command_line =
       base::CommandLine::ForCurrentProcess()->GetCommandLineString();
   html_source->AddString("aboutCommandLine", command_line);
 
@@ skipping 32 matching lines @@
       base::Bind(&AboutHandler::HandleGetVersionInfo, base::Unretained(this)));
   web_ui()->RegisterMessageCallback(
       "getRegulatoryInfo", base::Bind(&AboutHandler::HandleGetRegulatoryInfo,
                                       base::Unretained(this)));
   web_ui()->RegisterMessageCallback(
       "getCurrentChannel", base::Bind(&AboutHandler::HandleGetCurrentChannel,
                                       base::Unretained(this)));
   web_ui()->RegisterMessageCallback(
       "getTargetChannel", base::Bind(&AboutHandler::HandleGetTargetChannel,
                                      base::Unretained(this)));
+  web_ui()->RegisterMessageCallback(
+      "getCanChangeChannel",

[dpapad, 2016/12/02 23:27:12]

Nit: Maybe rename to just |canChangeChannel|? |getCan...| sounds odd, too many
verbs.

[stevenjb, 2016/12/06 20:38:03]

I decided this would all be a bit cleaner with a single getChannelInfo handler.
LMKWYT.

+      base::Bind(&AboutHandler::HandleGetCanChangeChannel,
+                 base::Unretained(this)));
 #endif
 #if defined(OS_MACOSX)
   web_ui()->RegisterMessageCallback(
       "promoteUpdater",
       base::Bind(&AboutHandler::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()),
@@ skipping 184 matching lines @@
 void AboutHandler::OnGetChannelReady(std::string callback_id,
                                      const std::string& channel) {
   ResolveJavascriptCallback(base::StringValue(callback_id),
                             base::StringValue(channel));
 }
 
 void AboutHandler::HandleRequestUpdate(const base::ListValue* args) {
   RequestUpdate();
 }
 
+void AboutHandler::HandleGetCanChangeChannel(const base::ListValue* args) {
+  CHECK_EQ(1U, args->GetSize());
+  std::string callback_id;
+  CHECK(args->GetString(0, &callback_id));
+
+  bool can_change_channel = CanChangeChannel(Profile::FromWebUI(web_ui()));
+
+  ResolveJavascriptCallback(base::StringValue(callback_id),
+                            base::FundamentalValue(can_change_channel));

[dpapad, 2016/12/02 23:27:12]

Nit (optional)

ResolveJavascriptCallback(
    base::StringValue(callback_id),
    base::FundamentalValue(CanChangeChannel(Profile::FromWebUI(web_ui())));

[stevenjb, 2016/12/06 20:38:02]

Done.

+}
+
 #endif  // defined(OS_CHROMEOS)
 
 void AboutHandler::RequestUpdate() {
   version_updater_->CheckForUpdate(
       base::Bind(&AboutHandler::SetUpdateStatus, base::Unretained(this)),
 #if defined(OS_MACOSX)
       base::Bind(&AboutHandler::SetPromotionState, base::Unretained(this)));
 #else
       VersionUpdater::PromoteCallback());
 #endif  // OS_MACOSX
@@ skipping 79 matching lines @@
   std::string url =
       std::string("chrome://") + chrome::kChromeOSAssetHost + "/" + image_path;
   regulatory_info->SetString("url", url);
 
   ResolveJavascriptCallback(base::StringValue(callback_id), *regulatory_info);
 }
 
 #endif  // defined(OS_CHROMEOS)
 
 }  // namespace settings