Removing ui-alternatives

ios/chrome/browser/ui/webui/flags_ui.cc

 // Copyright 2015 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 "ios/chrome/browser/ui/webui/flags_ui.h"
 
 #include <string>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 16 matching lines @@
 #include "ios/chrome/browser/browser_state/chrome_browser_state.h"
 #include "ios/chrome/browser/chrome_url_constants.h"
 #include "ios/web/public/web_ui_ios_data_source.h"
 #include "ios/web/public/webui/web_ui_ios.h"
 #include "ios/web/public/webui/web_ui_ios_message_handler.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
 namespace {
 
-web::WebUIIOSDataSource* CreateFlagsUIHTMLSource(
-    BaseFlagsUI::FlagsUIKind flags_ui_kind) {
-  web::WebUIIOSDataSource* source = web::WebUIIOSDataSource::Create(
-      flags_ui_kind == BaseFlagsUI::FLAGS_UI_APPLE ? kChromeUIAppleFlagsHost
-                                                   : kChromeUIFlagsHost);
+web::WebUIIOSDataSource* CreateFlagsUIHTMLSource() {
+  web::WebUIIOSDataSource* source =
+      web::WebUIIOSDataSource::Create(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);
-  }
+  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);
   source->AddLocalizedString(flags_ui::kChannelPromoBeta,
                              IDS_FLAGS_UI_PROMOTE_BETA_CHANNEL);
   source->AddLocalizedString(flags_ui::kChannelPromoDev,
                              IDS_FLAGS_UI_PROMOTE_DEV_CHANNEL);
   source->AddLocalizedString(flags_ui::kFlagsUnsupportedTableTitle,
                              IDS_FLAGS_UI_UNSUPPORTED_TABLE_TITLE);
   source->AddLocalizedString(flags_ui::kFlagsNotSupported,
                              IDS_FLAGS_UI_NOT_AVAILABLE);
   source->AddLocalizedString(flags_ui::kFlagsRestartNotice,
                              IDS_FLAGS_UI_RELAUNCH_NOTICE);
   source->AddLocalizedString(flags_ui::kFlagsRestartButton,
                              IDS_FLAGS_UI_RELAUNCH_BUTTON);
   source->AddLocalizedString(flags_ui::kResetAllButton,
                              IDS_FLAGS_UI_RESET_ALL_BUTTON);
   source->AddLocalizedString(flags_ui::kDisable, IDS_FLAGS_UI_DISABLE);
   source->AddLocalizedString(flags_ui::kEnable, IDS_FLAGS_UI_ENABLE);
 
   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;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // FlagsDOMHandler
 //
 ////////////////////////////////////////////////////////////////////////////////
 
 // The handler for Javascript messages for the about:flags page.
 class FlagsDOMHandler : public web::WebUIIOSMessageHandler {
  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);

[sdefresne, 2017/07/04 12:45:25]

Since you are changing this file, would you mind changing this method to take
FlagsStorage via std::unique_ptr<>? If not, maybe as a followup CL?

[noyau (Ping after 24h), 2017/07/06 09:53:55]

Done.

 
   // 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);
 
@@ skipping 89 matching lines @@
 
 void FlagsDOMHandler::HandleResetAllFlags(const base::ListValue* args) {
   DCHECK(flags_storage_);
   ResetAllFlags(flags_storage_.get());
 }
 
 }  // namespace
 
 ///////////////////////////////////////////////////////////////////////////////
 //
-// BaseFlagsUI
-//
-///////////////////////////////////////////////////////////////////////////////
-
-BaseFlagsUI::BaseFlagsUI(web::WebUIIOS* web_ui, FlagsUIKind flags_ui_kind)
-    : 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));
-}
-
-BaseFlagsUI::~BaseFlagsUI() {}
-
-///////////////////////////////////////////////////////////////////////////////
-//
 // FlagsUI
 //
 ///////////////////////////////////////////////////////////////////////////////
 
 FlagsUI::FlagsUI(web::WebUIIOS* web_ui)
-    : BaseFlagsUI(web_ui, BaseFlagsUI::FLAGS_UI_GENERIC) {}
+    : web::WebUIIOSController(web_ui), weak_factory_(this) {
+  FlagsDOMHandler* handler = new FlagsDOMHandler();
+  web_ui->AddMessageHandler(base::WrapUnique(handler));
+
+  flags_ui::FlagAccess flag_access = flags_ui::kOwnerAccessToFlags;
+  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());
+}
 
 FlagsUI::~FlagsUI() {}
-
-///////////////////////////////////////////////////////////////////////////////
-//
-// AppleFlagsUI
-//
-///////////////////////////////////////////////////////////////////////////////
-
-AppleFlagsUI::AppleFlagsUI(web::WebUIIOS* web_ui)
-    : BaseFlagsUI(web_ui, BaseFlagsUI::FLAGS_UI_APPLE) {}
-
-AppleFlagsUI::~AppleFlagsUI() {}