From aae0645d9f7957c355b8cf2c5c5778443320acb0 Mon Sep 17 00:00:00 2001 From: "vasilii@chromium.org" Date: Tue, 30 Jul 2013 17:11:48 +0000 Subject: [PATCH] Profile Reset: Get rid of the flag in about:flags. BUG=235037 TBR=battre@chromium.org, dbeam@chromium.org Review URL: https://codereview.chromium.org/20686002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@214376 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/ui/webui/options/browser_options_handler.cc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc index 94deb7ce4723..da78bb005d46 100644 --- a/chrome/browser/ui/webui/options/browser_options_handler.cc +++ b/chrome/browser/ui/webui/options/browser_options_handler.cc @@ -12,6 +12,7 @@ #include "base/bind_helpers.h" #include "base/command_line.h" #include "base/memory/singleton.h" +#include "base/metrics/field_trial.h" #include "base/metrics/histogram.h" #include "base/path_service.h" #include "base/prefs/pref_service.h" @@ -125,6 +126,10 @@ namespace options { namespace { +// Constants for the new tab button field trial. + const char kProfileResetTrialName[] = "ManualResetProfile"; + const char kProfileResetTrialEnableGroupName[] = "Enable"; + bool ShouldShowMultiProfilesUserList(chrome::HostDesktopType desktop_type) { #if defined(OS_CHROMEOS) // On Chrome OS we use different UI for multi-profiles. @@ -528,7 +533,11 @@ void BrowserOptionsHandler::GetLocalizedValues(DictionaryValue* values) { g_browser_process->gpu_mode_manager()->initial_gpu_mode_pref()); #endif + bool finch_allows_button = + base::FieldTrialList::FindFullName(kProfileResetTrialName) == + kProfileResetTrialEnableGroupName; values->SetBoolean("enableResetProfileSettingsSection", + finch_allows_button || CommandLine::ForCurrentProcess()->HasSwitch( switches::kEnableResetProfileSettings)); } -- 2.11.4.GIT