| Index: chrome/browser/ui/webui/settings/chrome_cleanup_handler.cc
|
| diff --git a/chrome/browser/ui/webui/settings/chrome_cleanup_handler.cc b/chrome/browser/ui/webui/settings/chrome_cleanup_handler.cc
|
| index b9f3891ecbb182c9f33062b45b39cd0bf234a1fe..565d7b4a23b468dba50f9a0d3481d6f77ac2a61d 100644
|
| --- a/chrome/browser/ui/webui/settings/chrome_cleanup_handler.cc
|
| +++ b/chrome/browser/ui/webui/settings/chrome_cleanup_handler.cc
|
| @@ -4,11 +4,14 @@
|
|
|
| #include "chrome/browser/ui/webui/settings/chrome_cleanup_handler.h"
|
|
|
| +// DO NOT SUBMIT. For the moment, please ignore changes to this file.
|
| +
|
| #include "base/command_line.h"
|
| #include "base/feature_list.h"
|
| #include "base/metrics/user_metrics.h"
|
| #include "base/synchronization/lock.h"
|
| #include "base/values.h"
|
| +#include "chrome/browser/safe_browsing/chrome_cleaner/srt_field_trial_win.h"
|
| #include "chrome/grit/generated_resources.h"
|
| #include "content/public/browser/web_contents.h"
|
| #include "content/public/browser/web_ui.h"
|
| @@ -19,9 +22,6 @@ using safe_browsing::ChromeCleanerController;
|
|
|
| namespace settings {
|
|
|
| -const base::Feature kInBrowserCleanerUIFeature{
|
| - "InBrowserCleanerUI", base::FEATURE_DISABLED_BY_DEFAULT};
|
| -
|
| namespace {
|
|
|
| base::ListValue GetFilesAsListStorage(
|
| @@ -37,7 +37,7 @@ base::ListValue GetFilesAsListStorage(
|
|
|
| ChromeCleanupHandler::ChromeCleanupHandler() {
|
| chromeCleanupVisible_ =
|
| - base::FeatureList::IsEnabled(kInBrowserCleanerUIFeature);
|
| + base::FeatureList::IsEnabled(safe_browsing::kInBrowserCleanerUIFeature);
|
| }
|
|
|
| ChromeCleanupHandler::~ChromeCleanupHandler() {}
|
| @@ -104,7 +104,8 @@ void ChromeCleanupHandler::HandleRegisterChromeCleanupObserver(
|
| DCHECK_EQ(0, args->GetSize());
|
|
|
| AllowJavascript();
|
| - if (!base::FeatureList::IsEnabled(kInBrowserCleanerUIFeature)) {
|
| + if (!base::FeatureList::IsEnabled(
|
| + safe_browsing::kInBrowserCleanerUIFeature)) {
|
| CallJavascriptFunction("cr.webUIListenerCallback",
|
| base::Value("chrome-cleanup-dismiss"));
|
| return;
|
| @@ -135,7 +136,7 @@ void ChromeCleanupHandler::HandleSetChromeCleanupVisibility(
|
| DCHECK_EQ(1U, args->GetSize());
|
|
|
| bool visible = false;
|
| - if (base::FeatureList::IsEnabled(kInBrowserCleanerUIFeature)) {
|
| + if (base::FeatureList::IsEnabled(safe_browsing::kInBrowserCleanerUIFeature)) {
|
| bool success = args->GetBoolean(0, &visible);
|
| DCHECK(success);
|
| }
|
|
|