Enhancements to https://codereview.chromium.org/12494033/ for zmo@

chrome/browser/ui/webui/options/browser_options_handler.cc

 // Copyright (c) 2012 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/browser_options_handler.h"
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/memory/singleton.h"
 #include "base/path_service.h"
 #include "base/prefs/pref_service.h"
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "base/value_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/auto_launch_trial.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_page_zoom.h"
 #include "chrome/browser/custom_home_pages_table_model.h"
 #include "chrome/browser/download/download_prefs.h"
+#include "chrome/browser/gpu/gpu_mode_manager.h"
 #include "chrome/browser/instant/search.h"
+#include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/prefs/session_startup_pref.h"
 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h"
 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory.h"
 #include "chrome/browser/printing/cloud_print/cloud_print_setup_flow.h"
 #include "chrome/browser/printing/cloud_print/cloud_print_url.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profile_info_util.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/profiles/profile_shortcut_manager.h"
@@ skipping 319 matching lines @@
     { "proxiesConfigureButton", IDS_OPTIONS_PROXIES_CONFIGURE_BUTTON },
 #endif
 #if defined(OS_CHROMEOS) && defined(USE_ASH)
     { "setWallpaper", IDS_SET_WALLPAPER_BUTTON },
 #endif
     { "advancedSectionTitleSystem",
       IDS_OPTIONS_ADVANCED_SECTION_TITLE_SYSTEM },
 #if !defined(OS_MACOSX) && !defined(OS_CHROMEOS)
     { "backgroundModeCheckbox", IDS_OPTIONS_SYSTEM_ENABLE_BACKGROUND_MODE },
 #endif
-    { "hardwareAccelerationModeCheckbox",
+#if !defined(OS_CHROMEOS)
+    { "gpuModeCheckbox",
       IDS_OPTIONS_SYSTEM_ENABLE_HARDWARE_ACCELERATION_MODE },
+    { "gpuModeResetRestart",
+      IDS_OPTIONS_SYSTEM_ENABLE_HARDWARE_ACCELERATION_MODE_RESTART },
     // Strings with product-name substitutions.
-#if !defined(OS_CHROMEOS)
     { "syncOverview", IDS_SYNC_OVERVIEW, IDS_PRODUCT_NAME },
     { "syncButtonTextStart", IDS_SYNC_START_SYNC_BUTTON_LABEL,
       IDS_SHORT_PRODUCT_NAME },
 #endif
     { "profilesSingleUser", IDS_PROFILES_SINGLE_USER_MESSAGE,
       IDS_PRODUCT_NAME },
     { "defaultBrowserUnknown", IDS_OPTIONS_DEFAULTBROWSER_UNKNOWN,
       IDS_PRODUCT_NAME },
     { "defaultBrowserUseAsDefault", IDS_OPTIONS_DEFAULTBROWSER_USEASDEFAULT,
       IDS_PRODUCT_NAME },
@@ skipping 101 matching lines @@
 #endif
 
   if (ShouldShowMultiProfilesUserList())
     values->Set("profilesInfo", GetProfilesInfoList().release());
 
 #if defined(ENABLE_MANAGED_USERS)
   ManagedUserService* service =
       ManagedUserServiceFactory::GetForProfile(Profile::FromWebUI(web_ui()));
   values->SetBoolean("profileIsManaged", service->ProfileIsManaged());
 #endif
+
+#if !defined(OS_CHROMEOS)
+  values->SetBoolean("gpuModeAtStart", GpuModeManager::IsGpuModePrefEnabled());
+#endif
 }
 
 void BrowserOptionsHandler::RegisterCloudPrintValues(DictionaryValue* values) {
 #if defined(OS_CHROMEOS)
   values->SetString("cloudPrintChromeosOptionLabel",
       l10n_util::GetStringFUTF16(
       IDS_CLOUD_PRINT_CHROMEOS_OPTION_LABEL,
       l10n_util::GetStringUTF16(IDS_GOOGLE_CLOUD_PRINT)));
   values->SetString("cloudPrintChromeosOptionButton",
       l10n_util::GetStringFUTF16(
@@ skipping 92 matching lines @@
       base::Bind(&BrowserOptionsHandler::HighContrastChangeCallback,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback(
       "virtualKeyboardChange",
       base::Bind(&BrowserOptionsHandler::VirtualKeyboardChangeCallback,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback(
       "performFactoryResetRestart",
       base::Bind(&BrowserOptionsHandler::PerformFactoryResetRestart,
                  base::Unretained(this)));
+#else
+  web_ui()->RegisterMessageCallback(
+      "restartBrowser",
+      base::Bind(&BrowserOptionsHandler::HandleRestartBrowser,
+                 base::Unretained(this)));
 #endif
 }
 
 void BrowserOptionsHandler::OnStateChanged() {
   web_ui()->CallJavascriptFunction("BrowserOptions.updateSyncState",
                                    *GetSyncStateDictionary());
 
   SendProfilesInfo();
 }
 
@@ skipping 611 matching lines @@
 }
 
 void BrowserOptionsHandler::HandleDefaultZoomFactor(const ListValue* args) {
   double zoom_factor;
   if (ExtractDoubleValue(args, &zoom_factor)) {
     default_zoom_level_.SetValue(
         WebKit::WebView::zoomFactorToZoomLevel(zoom_factor));
   }
 }
 
+void BrowserOptionsHandler::HandleRestartBrowser(const ListValue* args) {
+  chrome::AttemptRestart();
+}
+
 #if !defined(OS_CHROMEOS)
 void BrowserOptionsHandler::ShowNetworkProxySettings(const ListValue* args) {
   content::RecordAction(UserMetricsAction("Options_ShowProxySettings"));
   AdvancedOptionsUtilities::ShowNetworkProxySettings(
       web_ui()->GetWebContents());
 }
 #endif
 
 #if !defined(USE_NSS) && !defined(USE_OPENSSL)
 void BrowserOptionsHandler::ShowManageSSLCertificates(const ListValue* args) {
@@ skipping 235 matching lines @@
   base::FundamentalValue disabled(profile_pref_registrar_.IsManaged() ||
                                   is_extension_controlled);
   base::FundamentalValue extension_controlled(is_extension_controlled);
   web_ui()->CallJavascriptFunction("BrowserOptions.setupProxySettingsSection",
                                    disabled, extension_controlled);
 
 #endif  // !defined(OS_CHROMEOS)
 }
 
 }  // namespace options