MD Settings: implement "RESTART" button for hardware acceleration to take effect

chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.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 "chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 16 matching lines @@
 
 #if defined(OS_CHROMEOS)
 #include "ash/system/chromeos/devicetype_utils.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/signin/easy_unlock_service.h"
 #include "chrome/browser/ui/webui/chromeos/ui_account_tweaks.h"
 #include "chromeos/chromeos_switches.h"
 #include "components/user_manager/user.h"
 #include "components/user_manager/user_manager.h"
 #include "ui/chromeos/strings/grit/ui_chromeos_strings.h"
+#else
+#include "chrome/browser/ui/webui/settings/system_handler.h"
 #endif
 
+namespace settings {
 namespace {
 
 // Note that settings.html contains a <script> tag which imports a script of
 // the following name. These names must be kept in sync.
 const char kLocalizedStringsFile[] = "strings.js";
 
 struct LocalizedString {
   const char* name;
   int id;
 };
@@ skipping 11 matching lines @@
   LocalizedString localized_strings[] = {
       {"add", IDS_ADD},
       {"cancel", IDS_CANCEL},
       {"disable", IDS_DISABLE},
       {"learnMore", IDS_LEARN_MORE},
       {"ok", IDS_OK},
       {"save", IDS_SAVE},
       {"advancedPageTitle", IDS_SETTINGS_ADVANCED},
       {"basicPageTitle", IDS_SETTINGS_BASIC},
       {"settings", IDS_SETTINGS_SETTINGS},
+      {"restart", IDS_SETTINGS_RESTART},
   };
   AddLocalizedStringsBulk(html_source, localized_strings,
                           arraysize(localized_strings));
 }
 
 void AddA11yStrings(content::WebUIDataSource* html_source) {
   LocalizedString localized_strings[] = {
     {"a11yPageTitle", IDS_SETTINGS_ACCESSIBILITY},
 #if defined(OS_CHROMEOS)
     {"moreFeaturesLink", IDS_SETTINGS_MORE_FEATURES_LINK},
@@ skipping 279 matching lines @@
   LocalizedString localized_strings[] = {
     {"resetPageTitle", IDS_SETTINGS_RESET},
     {"resetPageDescription", IDS_RESET_PROFILE_SETTINGS_DESCRIPTION},
     {"resetPageExplanation", IDS_RESET_PROFILE_SETTINGS_EXPLANATION},
     {"resetPageCommit", IDS_RESET_PROFILE_SETTINGS_COMMIT_BUTTON},
     {"resetPageFeedback", IDS_RESET_PROFILE_SETTINGS_FEEDBACK},
 #if defined(OS_CHROMEOS)
     {"powerwashTitle", IDS_OPTIONS_FACTORY_RESET},
     {"powerwashDialogTitle", IDS_OPTIONS_FACTORY_RESET_HEADING},
     {"powerwashDialogExplanation", IDS_OPTIONS_FACTORY_RESET_WARNING},
     {"powerwashDialogButton", IDS_RELAUNCH_BUTTON},

[dpapad, 2016/03/21 18:17:38]

Can you add a TODO here for re-using the new IDS_SETTINGS_RESTART?

[Dan Beam, 2016/03/22 02:16:59]

Done. (just did it like we talked about on chat)

     {"powerwashLearnMoreUrl", IDS_FACTORY_RESET_HELP_URL},
 #endif
     // Automatic reset banner.
     {"resetProfileBannerButton",
      IDS_AUTOMATIC_SETTINGS_RESET_BANNER_RESET_BUTTON_TEXT},
     {"resetProfileBannerDescription", IDS_AUTOMATIC_SETTINGS_RESET_BANNER_TEXT},
   };
   AddLocalizedStringsBulk(html_source, localized_strings,
                           arraysize(localized_strings));
 
@@ skipping 110 matching lines @@
       {"cannotBeDisplayedInThisLanguage",
        IDS_SETTINGS_LANGUAGES_CANNOT_BE_DISPLAYED_IN_THIS_LANGUAGE},
       {"isDisplayedInThisLanguage",
        IDS_SETTINGS_LANGUAGES_IS_DISPLAYED_IN_THIS_LANGUAGE},
       {"displayInThisLanguage",
        IDS_SETTINGS_LANGUAGES_DISPLAY_IN_THIS_LANGUAGE},
       {"offerToTranslateInThisLanguage",
        IDS_OPTIONS_LANGUAGES_OFFER_TO_TRANSLATE_IN_THIS_LANGUAGE},
       {"cannotTranslateInThisLanguage",
        IDS_OPTIONS_LANGUAGES_CANNOT_TRANSLATE_IN_THIS_LANGUAGE},
-      {"restart", IDS_OPTIONS_SETTINGS_LANGUAGES_RELAUNCH_BUTTON},
       {"editDictionaryPageTitle", IDS_SETTINGS_LANGUAGES_EDIT_DICTIONARY_TITLE},
       {"addDictionaryWordLabel", IDS_SETTINGS_LANGUAGES_ADD_DICTIONARY_WORD},
       {"addDictionaryWordButton",
        IDS_SETTINGS_LANGUAGES_ADD_DICTIONARY_WORD_BUTTON},
       {"customDictionaryWords", IDS_SETTINGS_LANGUAGES_DICTIONARY_WORDS},
   };
   AddLocalizedStringsBulk(html_source, localized_strings,
                           arraysize(localized_strings));
 }
 
@@ skipping 292 matching lines @@
       {"systemPageTitle", IDS_SETTINGS_SYSTEM},
 #if !defined(OS_MACOSX)
       {"backgroundAppsLabel", IDS_SETTINGS_SYSTEM_BACKGROUND_APPS_LABEL},
 #endif
       {"hardwareAccelerationLabel",
           IDS_SETTINGS_SYSTEM_HARDWARE_ACCELERATION_LABEL},
       {"changeProxySettings", IDS_SETTINGS_SYSTEM_PROXY_SETTINGS_BUTTON},
   };
   AddLocalizedStringsBulk(html_source, localized_strings,
                           arraysize(localized_strings));
+
+  // TODO(dbeam): we probably shouldn't name this class "strings" but add all

[dpapad, 2016/03/21 18:17:38]

I guess you are referring to the file name "md_settings_localized_strings" since
there is no class. How about suggesting a renaming in the TODO to make in more
useful? Maybe
1) md_settings_localized_strings -> md_settings_load_time_data
2) AddLocalizedStrings -> AddLoadTimeData

[Dan Beam, 2016/03/22 02:16:59]

Done.

+  // kinds of other stuff as well (and pull logic from handlers to this file).
+  SystemHandler::AddLoadTimeData(html_source);
 }
 #endif
 
 void AddWebContentStrings(content::WebUIDataSource* html_source) {
   LocalizedString localized_strings[] = {
       {"webContent", IDS_SETTINGS_WEB_CONTENT},
       {"pageZoom", IDS_SETTINGS_PAGE_ZOOM_LABEL},
       {"fontSize", IDS_SETTINGS_FONT_SIZE_LABEL},
       {"verySmall", IDS_SETTINGS_VERY_SMALL_FONT},
       {"small", IDS_SETTINGS_SMALL_FONT},
@@ skipping 16 matching lines @@
       {"advancedFontSettings", IDS_SETTINGS_ADVANCED_FONT_SETTINGS},
       {"requiresWebStoreExtension", IDS_SETTINGS_REQUIRES_WEB_STORE_EXTENSION},
       {"quickBrownFox", IDS_SETTINGS_QUICK_BROWN_FOX},
   };
   AddLocalizedStringsBulk(html_source, localized_strings,
                           arraysize(localized_strings));
 }
 
 }  // namespace
 
-namespace settings {
-
 void AddLocalizedStrings(content::WebUIDataSource* html_source,
                          Profile* profile) {
   AddCommonStrings(html_source);
 
   AddA11yStrings(html_source);
   AddAboutStrings(html_source);
 #if defined(OS_CHROMEOS)
   AddAccountUITweaksStrings(html_source, profile);
 #endif
   AddAppearanceStrings(html_source);
@@ skipping 34 matching lines @@
 #endif
   AddUsersStrings(html_source);
   AddWebContentStrings(html_source);
 
   policy_indicator::AddLocalizedStrings(html_source);
 
   html_source->SetJsonPath(kLocalizedStringsFile);
 }
 
 }  // namespace settings