Chromium Code Reviews| Index: chrome/browser/ui/webui/options/browser_options_handler.cc |
| =================================================================== |
| --- chrome/browser/ui/webui/options/browser_options_handler.cc (revision 189066) |
| +++ chrome/browser/ui/webui/options/browser_options_handler.cc (working copy) |
| @@ -24,6 +24,7 @@ |
| #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/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" |
| @@ -364,8 +365,16 @@ |
| #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 }, |
| + { "gpuModeResetRestartPrefix", |
| + IDS_OPTIONS_SYSTEM_ENABLE_HARDWARE_ACCELERATION_MODE_RESTART_PREFIX }, |
| + { "gpuModeResetRestart", |
| + IDS_OPTIONS_SYSTEM_ENABLE_HARDWARE_ACCELERATION_MODE_RESTART }, |
| + { "gpuModeResetRestartSuffix", |
| + IDS_OPTIONS_SYSTEM_ENABLE_HARDWARE_ACCELERATION_MODE_RESTART_POSTFIX }, |
| +#endif |
| // Strings with product-name substitutions. |
| #if !defined(OS_CHROMEOS) |
|
Dan Beam
2013/03/21 02:03:52
^ combine with this block
Zhenyao Mo
2013/03/21 21:52:53
Done.
|
| { "syncOverview", IDS_SYNC_OVERVIEW, IDS_PRODUCT_NAME }, |
| @@ -602,6 +611,12 @@ |
| base::Bind(&BrowserOptionsHandler::PerformFactoryResetRestart, |
| base::Unretained(this))); |
| #endif |
| +#if !defined(OS_CHROMEOS) |
|
Dan Beam
2013/03/21 02:03:52
^ or use an
#else
Zhenyao Mo
2013/03/21 21:52:53
Done.
|
| + web_ui()->RegisterMessageCallback( |
| + "restartBrowser", |
| + base::Bind(&BrowserOptionsHandler::HandleRestartBrowser, |
| + base::Unretained(this))); |
| +#endif |
| } |
| void BrowserOptionsHandler::OnStateChanged() { |
| @@ -1232,6 +1247,10 @@ |
| } |
| } |
| +void BrowserOptionsHandler::HandleRestartBrowser(const ListValue* args) { |
| + chrome::AttemptRestart(); |
| +} |
| + |
| #if !defined(OS_CHROMEOS) |
| void BrowserOptionsHandler::ShowNetworkProxySettings(const ListValue* args) { |
| content::RecordAction(UserMetricsAction("Options_ShowProxySettings")); |