MD Settings: Migrating C++ handlers for profile reset page.

chrome/browser/ui/webui/settings/reset_profile_settings_handler.cc

 // Copyright 2013 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/options/reset_profile_settings_handler.h"
+#include "chrome/browser/ui/webui/settings/reset_profile_settings_handler.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string16.h"
 #include "base/values.h"
 #include "chrome/browser/google/google_brand.h"
 #include "chrome/browser/profile_resetter/automatic_profile_resetter.h"
 #include "chrome/browser/profile_resetter/automatic_profile_resetter_factory.h"
 #include "chrome/browser/profile_resetter/brandcode_config_fetcher.h"
 #include "chrome/browser/profile_resetter/brandcoded_default_settings.h"
 #include "chrome/browser/profile_resetter/profile_resetter.h"
 #include "chrome/browser/profile_resetter/resettable_settings_snapshot.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_ui.h"
 #include "ui/base/l10n/l10n_util.h"
 
 #if defined(OS_WIN)
 #include "chrome/browser/profile_resetter/triggered_profile_resetter.h"
 #include "chrome/browser/profile_resetter/triggered_profile_resetter_factory.h"
 #endif  // defined(OS_WIN)
 
-namespace options {
+namespace settings {
 
-ResetProfileSettingsHandler::ResetProfileSettingsHandler()
+ResetProfileSettingsHandler::ResetProfileSettingsHandler(content::WebUI* web_ui)
     : automatic_profile_resetter_(NULL),
       has_shown_confirmation_dialog_(false) {
   google_brand::GetBrand(&brandcode_);
-}
-
-ResetProfileSettingsHandler::~ResetProfileSettingsHandler() {}
-
-void ResetProfileSettingsHandler::InitializeHandler() {
-  Profile* profile = Profile::FromWebUI(web_ui());
+  Profile* profile = Profile::FromWebUI(web_ui);
   resetter_.reset(new ProfileResetter(profile));
   automatic_profile_resetter_ =
       AutomaticProfileResetterFactory::GetForBrowserContext(profile);
 }
 
-void ResetProfileSettingsHandler::InitializePage() {
-  web_ui()->CallJavascriptFunction(
-      "ResetProfileSettingsOverlay.setResettingState",
-      base::FundamentalValue(resetter_->IsActive()));
-  if (automatic_profile_resetter_ &&
-      automatic_profile_resetter_->ShouldShowResetBanner()) {
-    web_ui()->CallJavascriptFunction("ResetProfileSettingsBanner.show");

[Dan Beam, 2015/11/06 23:52:23]

so this seems to re-show the banner on refresh.  do we not need to handle that
case for new settings?

[dpapad, 2015/11/07 00:31:08]

I have removed anything related to the banner until Alan comes back with mocks
for it. Note that "reset banner" != "reset dialog". The banner is this
http://imgur.com/YaPRvOc.

-  }
-}
-
-void ResetProfileSettingsHandler::Uninitialize() {
+ResetProfileSettingsHandler::~ResetProfileSettingsHandler() {
   if (has_shown_confirmation_dialog_ && automatic_profile_resetter_) {
     automatic_profile_resetter_->NotifyDidCloseWebUIResetDialog(
         false /*performed_reset*/);
   }
 }
 
-void ResetProfileSettingsHandler::GetLocalizedValues(
-    base::DictionaryValue* localized_strings) {
-  DCHECK(localized_strings);
-
-  static OptionsStringResource resources[] = {
-    { "resetProfileSettingsBannerText",
-        IDS_RESET_PROFILE_SETTINGS_BANNER_TEXT },
-    { "resetProfileSettingsCommit", IDS_RESET_PROFILE_SETTINGS_COMMIT_BUTTON },
-    { "resetProfileSettingsExplanation",
-        IDS_RESET_PROFILE_SETTINGS_EXPLANATION },
-    { "resetProfileSettingsFeedback", IDS_RESET_PROFILE_SETTINGS_FEEDBACK }
-  };
-
-  RegisterStrings(localized_strings, resources, arraysize(resources));
-  RegisterTitle(localized_strings, "resetProfileSettingsOverlay",
-                IDS_RESET_PROFILE_SETTINGS_TITLE);
-  localized_strings->SetString(
-      "resetProfileSettingsLearnMoreUrl",
-      chrome::kResetProfileSettingsLearnMoreURL);
-
-  // Set up the localized strings for the triggered profile reset overlay.
-  // The reset tool name can currently only have a custom value on Windows.
-  base::string16 reset_tool_name;
-#if defined(OS_WIN)
-  Profile* profile = Profile::FromWebUI(web_ui());
-  TriggeredProfileResetter* triggered_profile_resetter =
-      TriggeredProfileResetterFactory::GetForBrowserContext(profile);
-  // TriggeredProfileResetter instance will be nullptr for incognito profiles.
-  if (triggered_profile_resetter)
-    reset_tool_name = triggered_profile_resetter->GetResetToolName();
-#endif
-
-  if (reset_tool_name.empty()) {
-    reset_tool_name = l10n_util::GetStringUTF16(
-        IDS_TRIGGERED_RESET_PROFILE_SETTINGS_DEFAULT_TOOL_NAME);
-  }
-  localized_strings->SetString(
-      "triggeredResetProfileSettingsOverlay",
-      l10n_util::GetStringFUTF16(IDS_TRIGGERED_RESET_PROFILE_SETTINGS_TITLE,
-                                 reset_tool_name));
-  // Set the title manually since RegisterTitle() wants an id.
-  base::string16 title_string(l10n_util::GetStringFUTF16(
-      IDS_TRIGGERED_RESET_PROFILE_SETTINGS_TITLE, reset_tool_name));
-  localized_strings->SetString("triggeredResetProfileSettingsOverlay",
-                               title_string);
-  localized_strings->SetString(
-      "triggeredResetProfileSettingsOverlayTabTitle",
-      l10n_util::GetStringFUTF16(IDS_OPTIONS_TAB_TITLE,
-                                 l10n_util::GetStringUTF16(IDS_SETTINGS_TITLE),
-                                 title_string));
-  localized_strings->SetString(
-      "triggeredResetProfileSettingsExplanation",
-      l10n_util::GetStringFUTF16(
-          IDS_TRIGGERED_RESET_PROFILE_SETTINGS_EXPLANATION, reset_tool_name));
-}
-
 void ResetProfileSettingsHandler::RegisterMessages() {
-  // Setup handlers specific to this panel.
   web_ui()->RegisterMessageCallback("performResetProfileSettings",
       base::Bind(&ResetProfileSettingsHandler::HandleResetProfileSettings,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("onShowResetProfileDialog",
       base::Bind(&ResetProfileSettingsHandler::OnShowResetProfileDialog,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("onHideResetProfileDialog",
       base::Bind(&ResetProfileSettingsHandler::OnHideResetProfileDialog,
                  base::Unretained(this)));
-  web_ui()->RegisterMessageCallback("onDismissedResetProfileSettingsBanner",
-      base::Bind(&ResetProfileSettingsHandler::
-                 OnDismissedResetProfileSettingsBanner,
-                 base::Unretained(this)));
 }
 
 void ResetProfileSettingsHandler::HandleResetProfileSettings(
     const base::ListValue* value) {
   bool send_settings = false;
   if (!value->GetBoolean(0, &send_settings))
     NOTREACHED();

[Dan Beam, 2015/11/06 23:52:23]

should this be NOTREACHED() + return?

[dpapad, 2015/11/07 00:31:08]

Adding a return statement here will cause the profile to not be reset in a
Release build, if that case happens (somehow), where as current behavior will
just keep going with send_settings=false. I think the latter is a better
behavior (and matches old settings).

[Dan Beam, 2015/11/07 00:52:00]

there are only 2 states AFAICT: the parameter is optional, in which case we
shouldn't NOTREACHED(), or it is required and we should AND return.  feel free
to update the old options/ version as well if you want behaviors to match.

[dpapad, 2015/11/07 01:49:51]

Resolved per chat discussion.

 
   DCHECK(brandcode_.empty() || config_fetcher_);
   if (config_fetcher_ && config_fetcher_->IsActive()) {
     // Reset once the prefs are fetched.
     config_fetcher_->SetCallback(
         base::Bind(&ResetProfileSettingsHandler::ResetProfile,
                    Unretained(this),
                    send_settings));
   } else {
     ResetProfile(send_settings);
   }
 }
 
 void ResetProfileSettingsHandler::OnResetProfileSettingsDone(
     bool send_feedback) {
-  web_ui()->CallJavascriptFunction("ResetProfileSettingsOverlay.doneResetting");
+  web_ui()->CallJavascriptFunction("SettingsResetPage.doneResetting");
   if (send_feedback && setting_snapshot_) {
     Profile* profile = Profile::FromWebUI(web_ui());
     ResettableSettingsSnapshot current_snapshot(profile);
     int difference = setting_snapshot_->FindDifferentFields(current_snapshot);
     if (difference) {
       setting_snapshot_->Subtract(current_snapshot);
       std::string report = SerializeSettingsReport(*setting_snapshot_,
                                                    difference);
       bool is_reset_prompt_active = automatic_profile_resetter_ &&
           automatic_profile_resetter_->IsResetPromptFlowActive();
       SendSettingsFeedback(report, profile, is_reset_prompt_active ?
           PROFILE_RESET_PROMPT : PROFILE_RESET_WEBUI);
     }
   }
   setting_snapshot_.reset();
   if (automatic_profile_resetter_) {
     automatic_profile_resetter_->NotifyDidCloseWebUIResetDialog(
         true /*performed_reset*/);
   }
 }
 
 void ResetProfileSettingsHandler::OnShowResetProfileDialog(
     const base::ListValue* value) {
   if (!resetter_->IsActive()) {
     setting_snapshot_.reset(
         new ResettableSettingsSnapshot(Profile::FromWebUI(web_ui())));
     setting_snapshot_->RequestShortcuts(base::Bind(
         &ResetProfileSettingsHandler::UpdateFeedbackUI, AsWeakPtr()));
-    UpdateFeedbackUI();

[Dan Beam, 2015/11/06 23:52:23]

why did you remove this?

[dpapad, 2015/11/07 00:31:08]

I could not justify what it was doing. It was calling UpdateFeedbackUI twice
(once as a callback from the previous line, and once because of the direct call
here). I am fine with restoring this line if there is a good reason.

[Dan Beam, 2015/11/07 00:52:00]

should this be removed from options/ as well, then?

[dpapad, 2015/11/07 01:49:51]

Actually after further inspection, I decided to add it back here.
settings_snapshot_ is already populated at line 185. The async call is simply
adding some extra data into the settings_snapshot object, therefore the direct
UpdateFeedbackUI call is meaningful.

   }
 
   if (automatic_profile_resetter_)
     automatic_profile_resetter_->NotifyDidOpenWebUIResetDialog();
   has_shown_confirmation_dialog_ = true;
 
   if (brandcode_.empty())
     return;
   config_fetcher_.reset(new BrandcodeConfigFetcher(
       base::Bind(&ResetProfileSettingsHandler::OnSettingsFetched,
                  Unretained(this)),
       GURL("https://tools.google.com/service/update2"),
       brandcode_));
 }
 
 void ResetProfileSettingsHandler::OnHideResetProfileDialog(
     const base::ListValue* value) {
   if (!resetter_->IsActive())
     setting_snapshot_.reset();
 }
 
-void ResetProfileSettingsHandler::OnDismissedResetProfileSettingsBanner(
-    const base::ListValue* args) {
-  if (automatic_profile_resetter_)
-    automatic_profile_resetter_->NotifyDidCloseWebUIResetBanner();
-}
-
 void ResetProfileSettingsHandler::OnSettingsFetched() {
   DCHECK(config_fetcher_);
   DCHECK(!config_fetcher_->IsActive());
   // The master prefs is fetched. We are waiting for user pressing 'Reset'.
 }
 
 void ResetProfileSettingsHandler::ResetProfile(bool send_settings) {
   DCHECK(resetter_);
   DCHECK(!resetter_->IsActive());
 
@@ skipping 23 matching lines @@
 
 void ResetProfileSettingsHandler::UpdateFeedbackUI() {
   if (!setting_snapshot_)
     return;
   scoped_ptr<base::ListValue> list = GetReadableFeedbackForSnapshot(
       Profile::FromWebUI(web_ui()),
       *setting_snapshot_);
   base::DictionaryValue feedback_info;
   feedback_info.Set("feedbackInfo", list.release());
   web_ui()->CallJavascriptFunction(
-      "ResetProfileSettingsOverlay.setFeedbackInfo",
-      feedback_info);
+      "SettingsResetPage.setFeedbackInfo", feedback_info);
 }
 
-}  // namespace options
+}  // namespace settings