Commit 42c7a462 authored by Yann Dago's avatar Yann Dago Committed by Commit Bot

Extract FlagsDOMHandler in its own class and rename it to FlagsUIHandler

Bug: 982371
Change-Id: I3442efe051902541697c7f2499e63ab06e0d1361
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1713365Reviewed-by: default avatarHector Carmona <hcarmona@chromium.org>
Commit-Queue: Yann Dago <ydago@chromium.org>
Cr-Commit-Position: refs/heads/master@{#680122}
parent deb62978
...@@ -241,6 +241,8 @@ jumbo_split_static_library("ui") { ...@@ -241,6 +241,8 @@ jumbo_split_static_library("ui") {
"webui/fileicon_source.h", "webui/fileicon_source.h",
"webui/flags_ui.cc", "webui/flags_ui.cc",
"webui/flags_ui.h", "webui/flags_ui.h",
"webui/flags_ui_handler.cc",
"webui/flags_ui_handler.h",
"webui/gcm_internals_ui.cc", "webui/gcm_internals_ui.cc",
"webui/gcm_internals_ui.h", "webui/gcm_internals_ui.h",
"webui/interstitials/interstitial_ui.cc", "webui/interstitials/interstitial_ui.cc",
......
...@@ -14,12 +14,9 @@ ...@@ -14,12 +14,9 @@
#include "base/memory/ref_counted_memory.h" #include "base/memory/ref_counted_memory.h"
#include "base/strings/utf_string_conversions.h" #include "base/strings/utf_string_conversions.h"
#include "base/values.h" #include "base/values.h"
#include "build/build_config.h"
#include "chrome/browser/about_flags.h"
#include "chrome/browser/browser_process.h" #include "chrome/browser/browser_process.h"
#include "chrome/browser/lifetime/application_lifetime.h"
#include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile.h"
#include "chrome/common/channel_info.h" #include "chrome/browser/ui/webui/flags_ui_handler.h"
#include "chrome/common/pref_names.h" #include "chrome/common/pref_names.h"
#include "chrome/common/url_constants.h" #include "chrome/common/url_constants.h"
#include "components/flags_ui/flags_ui_constants.h" #include "components/flags_ui/flags_ui_constants.h"
...@@ -85,195 +82,6 @@ content::WebUIDataSource* CreateFlagsUIHTMLSource() { ...@@ -85,195 +82,6 @@ content::WebUIDataSource* CreateFlagsUIHTMLSource() {
return source; return source;
} }
////////////////////////////////////////////////////////////////////////////////
//
// FlagsDOMHandler
//
////////////////////////////////////////////////////////////////////////////////
// The handler for Javascript messages for the about:flags page.
class FlagsDOMHandler : public WebUIMessageHandler {
public:
FlagsDOMHandler() : access_(flags_ui::kGeneralAccessFlagsOnly),
experimental_features_requested_(false) {
}
~FlagsDOMHandler() override {}
// Initializes the DOM handler with the provided flags storage and flags
// access. If there were flags experiments requested from javascript before
// this was called, it calls |HandleRequestExperimentalFeatures| again.
void Init(flags_ui::FlagsStorage* flags_storage,
flags_ui::FlagAccess access);
// WebUIMessageHandler implementation.
void RegisterMessages() override;
// Callback for the "requestExperimentFeatures" message.
void HandleRequestExperimentalFeatures(const base::ListValue* args);
// Callback for the "enableExperimentalFeature" message.
void HandleEnableExperimentalFeatureMessage(const base::ListValue* args);
// Callback for the "setOriginListFlag" message.
void HandleSetOriginListFlagMessage(const base::ListValue* args);
// Callback for the "restartBrowser" message. Restores all tabs on restart.
void HandleRestartBrowser(const base::ListValue* args);
// Callback for the "resetAllFlags" message.
void HandleResetAllFlags(const base::ListValue* args);
private:
std::unique_ptr<flags_ui::FlagsStorage> flags_storage_;
flags_ui::FlagAccess access_;
bool experimental_features_requested_;
DISALLOW_COPY_AND_ASSIGN(FlagsDOMHandler);
};
void FlagsDOMHandler::RegisterMessages() {
web_ui()->RegisterMessageCallback(
flags_ui::kRequestExperimentalFeatures,
base::BindRepeating(&FlagsDOMHandler::HandleRequestExperimentalFeatures,
base::Unretained(this)));
web_ui()->RegisterMessageCallback(
flags_ui::kEnableExperimentalFeature,
base::BindRepeating(
&FlagsDOMHandler::HandleEnableExperimentalFeatureMessage,
base::Unretained(this)));
web_ui()->RegisterMessageCallback(
flags_ui::kSetOriginListFlag,
base::BindRepeating(&FlagsDOMHandler::HandleSetOriginListFlagMessage,
base::Unretained(this)));
web_ui()->RegisterMessageCallback(
flags_ui::kRestartBrowser,
base::BindRepeating(&FlagsDOMHandler::HandleRestartBrowser,
base::Unretained(this)));
web_ui()->RegisterMessageCallback(
flags_ui::kResetAllFlags,
base::BindRepeating(&FlagsDOMHandler::HandleResetAllFlags,
base::Unretained(this)));
}
void FlagsDOMHandler::Init(flags_ui::FlagsStorage* flags_storage,
flags_ui::FlagAccess access) {
flags_storage_.reset(flags_storage);
access_ = access;
if (experimental_features_requested_)
HandleRequestExperimentalFeatures(nullptr);
}
void FlagsDOMHandler::HandleRequestExperimentalFeatures(
const base::ListValue* args) {
experimental_features_requested_ = true;
// Bail out if the handler hasn't been initialized yet. The request will be
// handled after the initialization.
if (!flags_storage_)
return;
base::DictionaryValue results;
std::unique_ptr<base::ListValue> supported_features(new base::ListValue);
std::unique_ptr<base::ListValue> unsupported_features(new base::ListValue);
about_flags::GetFlagFeatureEntries(flags_storage_.get(),
access_,
supported_features.get(),
unsupported_features.get());
results.Set(flags_ui::kSupportedFeatures, std::move(supported_features));
results.Set(flags_ui::kUnsupportedFeatures, std::move(unsupported_features));
results.SetBoolean(flags_ui::kNeedsRestart,
about_flags::IsRestartNeededToCommitChanges());
results.SetBoolean(flags_ui::kShowOwnerWarning,
access_ == flags_ui::kGeneralAccessFlagsOnly);
#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_CHROMEOS)
version_info::Channel channel = chrome::GetChannel();
results.SetBoolean(flags_ui::kShowBetaChannelPromotion,
channel == version_info::Channel::STABLE);
results.SetBoolean(flags_ui::kShowDevChannelPromotion,
channel == version_info::Channel::BETA);
#else
results.SetBoolean(flags_ui::kShowBetaChannelPromotion, false);
results.SetBoolean(flags_ui::kShowDevChannelPromotion, false);
#endif
web_ui()->CallJavascriptFunctionUnsafe(flags_ui::kReturnExperimentalFeatures,
results);
}
void FlagsDOMHandler::HandleEnableExperimentalFeatureMessage(
const base::ListValue* args) {
DCHECK(flags_storage_);
DCHECK_EQ(2u, args->GetSize());
if (args->GetSize() != 2)
return;
std::string entry_internal_name;
std::string enable_str;
if (!args->GetString(0, &entry_internal_name) ||
!args->GetString(1, &enable_str))
return;
about_flags::SetFeatureEntryEnabled(flags_storage_.get(), entry_internal_name,
enable_str == "true");
}
void FlagsDOMHandler::HandleSetOriginListFlagMessage(
const base::ListValue* args) {
DCHECK(flags_storage_);
if (args->GetSize() != 2) {
NOTREACHED();
return;
}
std::string entry_internal_name;
std::string value_str;
if (!args->GetString(0, &entry_internal_name) ||
!args->GetString(1, &value_str) || entry_internal_name.empty()) {
NOTREACHED();
return;
}
about_flags::SetOriginListFlag(entry_internal_name, value_str,
flags_storage_.get());
}
void FlagsDOMHandler::HandleRestartBrowser(const base::ListValue* args) {
DCHECK(flags_storage_);
#if defined(OS_CHROMEOS)
// On ChromeOS be less intrusive and restart inside the user session after
// we apply the newly selected flags.
base::CommandLine user_flags(base::CommandLine::NO_PROGRAM);
about_flags::ConvertFlagsToSwitches(flags_storage_.get(),
&user_flags,
flags_ui::kAddSentinels);
// Adhere to policy-enforced command-line switch handling when
// applying modified flags..
chromeos::UserSessionManager::ApplyUserPolicyToSwitches(
Profile::FromWebUI(web_ui())->GetPrefs(), &user_flags);
base::CommandLine::StringVector flags;
// argv[0] is the program name |base::CommandLine::NO_PROGRAM|.
flags.assign(user_flags.argv().begin() + 1, user_flags.argv().end());
VLOG(1) << "Restarting to apply per-session flags...";
AccountId account_id =
user_manager::UserManager::Get()->GetActiveUser()->GetAccountId();
chromeos::UserSessionManager::GetInstance()->SetSwitchesForUser(
account_id,
chromeos::UserSessionManager::CommandLineSwitchesType::
kPolicyAndFlagsAndKioskControl,
flags);
#endif
chrome::AttemptRestart();
}
void FlagsDOMHandler::HandleResetAllFlags(const base::ListValue* args) {
DCHECK(flags_storage_);
about_flags::ResetAllFlags(flags_storage_.get());
}
#if defined(OS_CHROMEOS) #if defined(OS_CHROMEOS)
// On ChromeOS verifying if the owner is signed in is async operation and only // On ChromeOS verifying if the owner is signed in is async operation and only
// after finishing it the UI can be properly populated. This function is the // after finishing it the UI can be properly populated. This function is the
...@@ -281,7 +89,7 @@ void FlagsDOMHandler::HandleResetAllFlags(const base::ListValue* args) { ...@@ -281,7 +89,7 @@ void FlagsDOMHandler::HandleResetAllFlags(const base::ListValue* args) {
// proper PrefService for the flags interface. // proper PrefService for the flags interface.
void FinishInitialization(base::WeakPtr<FlagsUI> flags_ui, void FinishInitialization(base::WeakPtr<FlagsUI> flags_ui,
Profile* profile, Profile* profile,
FlagsDOMHandler* dom_handler, FlagsUIHandler* dom_handler,
bool current_user_is_owner) { bool current_user_is_owner) {
DCHECK(!profile->IsOffTheRecord()); DCHECK(!profile->IsOffTheRecord());
// If the flags_ui has gone away, there's nothing to do. // If the flags_ui has gone away, there's nothing to do.
...@@ -309,17 +117,11 @@ void FinishInitialization(base::WeakPtr<FlagsUI> flags_ui, ...@@ -309,17 +117,11 @@ void FinishInitialization(base::WeakPtr<FlagsUI> flags_ui,
} // namespace } // namespace
///////////////////////////////////////////////////////////////////////////////
//
// FlagsUI
//
///////////////////////////////////////////////////////////////////////////////
FlagsUI::FlagsUI(content::WebUI* web_ui) : WebUIController(web_ui) { FlagsUI::FlagsUI(content::WebUI* web_ui) : WebUIController(web_ui) {
Profile* profile = Profile::FromWebUI(web_ui); Profile* profile = Profile::FromWebUI(web_ui);
auto handler_owner = std::make_unique<FlagsDOMHandler>(); auto handler_owner = std::make_unique<FlagsUIHandler>();
FlagsDOMHandler* handler = handler_owner.get(); FlagsUIHandler* handler = handler_owner.get();
web_ui->AddMessageHandler(std::move(handler_owner)); web_ui->AddMessageHandler(std::move(handler_owner));
#if defined(OS_CHROMEOS) #if defined(OS_CHROMEOS)
......
// Copyright (c) 2019 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/flags_ui_handler.h"
#include "base/bind.h"
#include "chrome/browser/about_flags.h"
#include "chrome/browser/lifetime/application_lifetime.h"
#include "chrome/common/channel_info.h"
#include "components/flags_ui/flags_storage.h"
#include "components/flags_ui/flags_ui_constants.h"
#include "components/version_info/channel.h"
#if defined(OS_CHROMEOS)
#include "base/system/sys_info.h"
#include "chrome/browser/chromeos/login/session/user_session_manager.h"
#include "components/account_id/account_id.h"
#include "components/pref_registry/pref_registry_syncable.h"
#include "components/user_manager/user_manager.h"
#endif
FlagsUIHandler::FlagsUIHandler()
: access_(flags_ui::kGeneralAccessFlagsOnly),
experimental_features_requested_(false) {}
FlagsUIHandler::~FlagsUIHandler() {}
void FlagsUIHandler::RegisterMessages() {
web_ui()->RegisterMessageCallback(
flags_ui::kRequestExperimentalFeatures,
base::BindRepeating(&FlagsUIHandler::HandleRequestExperimentalFeatures,
base::Unretained(this)));
web_ui()->RegisterMessageCallback(
flags_ui::kEnableExperimentalFeature,
base::BindRepeating(
&FlagsUIHandler::HandleEnableExperimentalFeatureMessage,
base::Unretained(this)));
web_ui()->RegisterMessageCallback(
flags_ui::kSetOriginListFlag,
base::BindRepeating(&FlagsUIHandler::HandleSetOriginListFlagMessage,
base::Unretained(this)));
web_ui()->RegisterMessageCallback(
flags_ui::kRestartBrowser,
base::BindRepeating(&FlagsUIHandler::HandleRestartBrowser,
base::Unretained(this)));
web_ui()->RegisterMessageCallback(
flags_ui::kResetAllFlags,
base::BindRepeating(&FlagsUIHandler::HandleResetAllFlags,
base::Unretained(this)));
}
void FlagsUIHandler::Init(flags_ui::FlagsStorage* flags_storage,
flags_ui::FlagAccess access) {
flags_storage_.reset(flags_storage);
access_ = access;
if (experimental_features_requested_)
HandleRequestExperimentalFeatures(nullptr);
}
void FlagsUIHandler::HandleRequestExperimentalFeatures(
const base::ListValue* args) {
experimental_features_requested_ = true;
// Bail out if the handler hasn't been initialized yet. The request will be
// handled after the initialization.
if (!flags_storage_)
return;
base::DictionaryValue results;
std::unique_ptr<base::ListValue> supported_features(new base::ListValue);
std::unique_ptr<base::ListValue> unsupported_features(new base::ListValue);
about_flags::GetFlagFeatureEntries(flags_storage_.get(), access_,
supported_features.get(),
unsupported_features.get());
results.Set(flags_ui::kSupportedFeatures, std::move(supported_features));
results.Set(flags_ui::kUnsupportedFeatures, std::move(unsupported_features));
results.SetBoolean(flags_ui::kNeedsRestart,
about_flags::IsRestartNeededToCommitChanges());
results.SetBoolean(flags_ui::kShowOwnerWarning,
access_ == flags_ui::kGeneralAccessFlagsOnly);
#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_CHROMEOS)
version_info::Channel channel = chrome::GetChannel();
results.SetBoolean(flags_ui::kShowBetaChannelPromotion,
channel == version_info::Channel::STABLE);
results.SetBoolean(flags_ui::kShowDevChannelPromotion,
channel == version_info::Channel::BETA);
#else
results.SetBoolean(flags_ui::kShowBetaChannelPromotion, false);
results.SetBoolean(flags_ui::kShowDevChannelPromotion, false);
#endif
web_ui()->CallJavascriptFunctionUnsafe(flags_ui::kReturnExperimentalFeatures,
results);
}
void FlagsUIHandler::HandleEnableExperimentalFeatureMessage(
const base::ListValue* args) {
DCHECK(flags_storage_);
DCHECK_EQ(2u, args->GetSize());
if (args->GetSize() != 2)
return;
std::string entry_internal_name;
std::string enable_str;
if (!args->GetString(0, &entry_internal_name) ||
!args->GetString(1, &enable_str))
return;
about_flags::SetFeatureEntryEnabled(flags_storage_.get(), entry_internal_name,
enable_str == "true");
}
void FlagsUIHandler::HandleSetOriginListFlagMessage(
const base::ListValue* args) {
DCHECK(flags_storage_);
if (args->GetSize() != 2) {
NOTREACHED();
return;
}
std::string entry_internal_name;
std::string value_str;
if (!args->GetString(0, &entry_internal_name) ||
!args->GetString(1, &value_str) || entry_internal_name.empty()) {
NOTREACHED();
return;
}
about_flags::SetOriginListFlag(entry_internal_name, value_str,
flags_storage_.get());
}
void FlagsUIHandler::HandleRestartBrowser(const base::ListValue* args) {
DCHECK(flags_storage_);
#if defined(OS_CHROMEOS)
// On ChromeOS be less intrusive and restart inside the user session after
// we apply the newly selected flags.
base::CommandLine user_flags(base::CommandLine::NO_PROGRAM);
about_flags::ConvertFlagsToSwitches(flags_storage_.get(), &user_flags,
flags_ui::kAddSentinels);
// Adhere to policy-enforced command-line switch handling when
// applying modified flags..
chromeos::UserSessionManager::ApplyUserPolicyToSwitches(
Profile::FromWebUI(web_ui())->GetPrefs(), &user_flags);
base::CommandLine::StringVector flags;
// argv[0] is the program name |base::CommandLine::NO_PROGRAM|.
flags.assign(user_flags.argv().begin() + 1, user_flags.argv().end());
VLOG(1) << "Restarting to apply per-session flags...";
AccountId account_id =
user_manager::UserManager::Get()->GetActiveUser()->GetAccountId();
chromeos::UserSessionManager::GetInstance()->SetSwitchesForUser(
account_id,
chromeos::UserSessionManager::CommandLineSwitchesType::
kPolicyAndFlagsAndKioskControl,
flags);
#endif
chrome::AttemptRestart();
}
void FlagsUIHandler::HandleResetAllFlags(const base::ListValue* args) {
DCHECK(flags_storage_);
about_flags::ResetAllFlags(flags_storage_.get());
}
// Copyright (c) 2019 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/flags_ui.h"
#include "build/build_config.h"
#include "components/flags_ui/feature_entry.h"
#include "components/flags_ui/flags_state.h"
#include "content/public/browser/web_ui_message_handler.h"
#ifndef CHROME_BROWSER_UI_WEBUI_FLAGS_UI_HANDLER_H_
#define CHROME_BROWSER_UI_WEBUI_FLAGS_UI_HANDLER_H_
namespace flags_ui {
class FlagsStorage;
}
class FlagsUIHandler : public content::WebUIMessageHandler {
public:
FlagsUIHandler();
~FlagsUIHandler() override;
// Initializes the UI handler with the provided flags storage and flags
// access. If there were flags experiments requested from javascript before
// this was called, it calls |HandleRequestExperimentalFeatures| again.
void Init(flags_ui::FlagsStorage* flags_storage, flags_ui::FlagAccess access);
// WebUIMessageHandler implementation.
void RegisterMessages() override;
// Callback for the "requestExperimentFeatures" message.
void HandleRequestExperimentalFeatures(const base::ListValue* args);
// Callback for the "enableExperimentalFeature" message.
void HandleEnableExperimentalFeatureMessage(const base::ListValue* args);
// Callback for the "setOriginListFlag" message.
void HandleSetOriginListFlagMessage(const base::ListValue* args);
// Callback for the "restartBrowser" message. Restores all tabs on restart.
void HandleRestartBrowser(const base::ListValue* args);
// Callback for the "resetAllFlags" message.
void HandleResetAllFlags(const base::ListValue* args);
private:
std::unique_ptr<flags_ui::FlagsStorage> flags_storage_;
flags_ui::FlagAccess access_;
bool experimental_features_requested_;
DISALLOW_COPY_AND_ASSIGN(FlagsUIHandler);
};
#endif // CHROME_BROWSER_UI_WEBUI_FLAGS_UI_HANDLER_H_
...@@ -128,26 +128,20 @@ function highlightReferencedFlag() { ...@@ -128,26 +128,20 @@ function highlightReferencedFlag() {
} }
/** /**
* Asks the C++ FlagsDOMHandler to get details about the available experimental * Gets details and configuration about the available features. The
* features and return detailed data about the configuration. The * |returnExperimentalFeatures()| will be called with reply.
* FlagsDOMHandler should reply to returnFlagsExperiments() (below).
*/ */
function requestExperimentalFeaturesData() { function requestExperimentalFeaturesData() {
chrome.send('requestExperimentalFeatures'); chrome.send('requestExperimentalFeatures');
} }
/** /** Restart browser and restore tabs. */
* Asks the C++ FlagsDOMHandler to restart the browser (restoring tabs).
*/
function restartBrowser() { function restartBrowser() {
chrome.send('restartBrowser'); chrome.send('restartBrowser');
} }
/** /** Reset all flags to their default values and refresh the UI. */
* Reset all flags to their default values and refresh the UI.
*/
function resetAllFlags() { function resetAllFlags() {
// Asks the C++ FlagsDOMHandler to reset all flags to default values.
chrome.send('resetAllFlags'); chrome.send('resetAllFlags');
showRestartToast(true); showRestartToast(true);
requestExperimentalFeaturesData(); requestExperimentalFeaturesData();
...@@ -248,7 +242,6 @@ function experimentChangesUiUpdates(node, index) { ...@@ -248,7 +242,6 @@ function experimentChangesUiUpdates(node, index) {
* @param {boolean} enable Whether to enable or disable the experiment. * @param {boolean} enable Whether to enable or disable the experiment.
*/ */
function handleEnableExperimentalFeature(node, enable) { function handleEnableExperimentalFeature(node, enable) {
// Tell the C++ FlagsDOMHandler to enable/disable the experiment.
chrome.send('enableExperimentalFeature', [String(node.internal_name), chrome.send('enableExperimentalFeature', [String(node.internal_name),
String(enable)]); String(enable)]);
experimentChangesUiUpdates(node, enable ? 1 : 0); experimentChangesUiUpdates(node, enable ? 1 : 0);
...@@ -266,7 +259,6 @@ function handleSetOriginListFlag(node, value) { ...@@ -266,7 +259,6 @@ function handleSetOriginListFlag(node, value) {
* @param {number} index The index of the option that was selected. * @param {number} index The index of the option that was selected.
*/ */
function handleSelectExperimentalFeatureChoice(node, index) { function handleSelectExperimentalFeatureChoice(node, index) {
// Tell the C++ FlagsDOMHandler to enable the selected choice.
chrome.send('enableExperimentalFeature', chrome.send('enableExperimentalFeature',
[String(node.internal_name) + '@' + index, 'true']); [String(node.internal_name) + '@' + index, 'true']);
experimentChangesUiUpdates(node, index); experimentChangesUiUpdates(node, index);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment