Index: ios/chrome/browser/ui/webui/flags_ui.cc |
diff --git a/ios/chrome/browser/ui/webui/flags_ui.cc b/ios/chrome/browser/ui/webui/flags_ui.cc |
index 76228168d7b85183248359ac40366fbb8d92e5b5..0ae8e4ade34f2e6a300b2e5a3b1526351d9bb7b1 100644 |
--- a/ios/chrome/browser/ui/webui/flags_ui.cc |
+++ b/ios/chrome/browser/ui/webui/flags_ui.cc |
@@ -34,24 +34,14 @@ |
namespace { |
-web::WebUIIOSDataSource* CreateFlagsUIHTMLSource( |
- BaseFlagsUI::FlagsUIKind flags_ui_kind) { |
- web::WebUIIOSDataSource* source = web::WebUIIOSDataSource::Create( |
- flags_ui_kind == BaseFlagsUI::FLAGS_UI_APPLE ? kChromeUIAppleFlagsHost |
- : kChromeUIFlagsHost); |
- |
- if (flags_ui_kind == BaseFlagsUI::FLAGS_UI_APPLE) { |
- source->AddLocalizedString(flags_ui::kFlagsTableTitle, |
- IDS_FLAGS_UI_ALTERNATIVES_UI_TABLE_TITLE); |
- source->AddLocalizedString( |
- flags_ui::kFlagsNoExperimentsAvailable, |
- IDS_FLAGS_UI_ALTERNATIVES_UI_NO_EXPERIMENTS_AVAILABLE); |
- } else { |
- source->AddLocalizedString(flags_ui::kFlagsLongTitle, |
- IDS_FLAGS_UI_LONG_TITLE); |
- source->AddLocalizedString(flags_ui::kFlagsTableTitle, |
- IDS_FLAGS_UI_TABLE_TITLE); |
- } |
+web::WebUIIOSDataSource* CreateFlagsUIHTMLSource() { |
+ web::WebUIIOSDataSource* source = |
+ web::WebUIIOSDataSource::Create(kChromeUIFlagsHost); |
+ |
+ source->AddLocalizedString(flags_ui::kFlagsLongTitle, |
+ IDS_FLAGS_UI_LONG_TITLE); |
+ source->AddLocalizedString(flags_ui::kFlagsTableTitle, |
+ IDS_FLAGS_UI_TABLE_TITLE); |
source->AddLocalizedString(flags_ui::kFlagsWarningHeader, |
IDS_FLAGS_UI_WARNING_HEADER); |
source->AddLocalizedString(flags_ui::kFlagsBlurb, IDS_FLAGS_UI_WARNING_TEXT); |
@@ -74,9 +64,7 @@ web::WebUIIOSDataSource* CreateFlagsUIHTMLSource( |
source->SetJsonPath("strings.js"); |
source->AddResourcePath(flags_ui::kFlagsJS, IDR_FLAGS_UI_FLAGS_JS); |
- source->SetDefaultResource(flags_ui_kind == BaseFlagsUI::FLAGS_UI_APPLE |
- ? IDR_APPLE_FLAGS_HTML |
- : IDR_FLAGS_UI_FLAGS_HTML); |
+ source->SetDefaultResource(IDR_FLAGS_UI_FLAGS_HTML); |
return source; |
} |
@@ -207,51 +195,23 @@ void FlagsDOMHandler::HandleResetAllFlags(const base::ListValue* args) { |
/////////////////////////////////////////////////////////////////////////////// |
// |
-// BaseFlagsUI |
+// FlagsUI |
// |
/////////////////////////////////////////////////////////////////////////////// |
-BaseFlagsUI::BaseFlagsUI(web::WebUIIOS* web_ui, FlagsUIKind flags_ui_kind) |
+FlagsUI::FlagsUI(web::WebUIIOS* web_ui) |
: web::WebUIIOSController(web_ui), weak_factory_(this) { |
- Initialize(web_ui, flags_ui_kind); |
-} |
- |
-void BaseFlagsUI::Initialize(web::WebUIIOS* web_ui, FlagsUIKind flags_ui_kind) { |
FlagsDOMHandler* handler = new FlagsDOMHandler(); |
web_ui->AddMessageHandler(base::WrapUnique(handler)); |
flags_ui::FlagAccess flag_access = flags_ui::kOwnerAccessToFlags; |
- if (flags_ui_kind == FLAGS_UI_APPLE) |
- flag_access = flags_ui::kAppleReviewAccessToFlags; |
handler->Init(new flags_ui::PrefServiceFlagsStorage( |
GetApplicationContext()->GetLocalState()), |
flag_access); |
// Set up the about:flags source. |
web::WebUIIOSDataSource::Add(ios::ChromeBrowserState::FromWebUIIOS(web_ui), |
- CreateFlagsUIHTMLSource(flags_ui_kind)); |
+ CreateFlagsUIHTMLSource()); |
} |
-BaseFlagsUI::~BaseFlagsUI() {} |
- |
-/////////////////////////////////////////////////////////////////////////////// |
-// |
-// FlagsUI |
-// |
-/////////////////////////////////////////////////////////////////////////////// |
- |
-FlagsUI::FlagsUI(web::WebUIIOS* web_ui) |
- : BaseFlagsUI(web_ui, BaseFlagsUI::FLAGS_UI_GENERIC) {} |
- |
FlagsUI::~FlagsUI() {} |
- |
-/////////////////////////////////////////////////////////////////////////////// |
-// |
-// AppleFlagsUI |
-// |
-/////////////////////////////////////////////////////////////////////////////// |
- |
-AppleFlagsUI::AppleFlagsUI(web::WebUIIOS* web_ui) |
- : BaseFlagsUI(web_ui, BaseFlagsUI::FLAGS_UI_APPLE) {} |
- |
-AppleFlagsUI::~AppleFlagsUI() {} |