 Chromium Code Reviews
 Chromium Code Reviews Issue 10544171:
  Add OptionsUI and its handler for multiple displays.  (Closed) 
  Base URL: svn://svn.chromium.org/chrome/trunk/src
    
  
    Issue 10544171:
  Add OptionsUI and its handler for multiple displays.  (Closed) 
  Base URL: svn://svn.chromium.org/chrome/trunk/src| OLD | NEW | 
|---|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be | 
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. | 
| 4 | 4 | 
| 5 #include "chrome/browser/ui/webui/options2/browser_options_handler2.h" | 5 #include "chrome/browser/ui/webui/options2/browser_options_handler2.h" | 
| 6 | 6 | 
| 7 #include <string> | 7 #include <string> | 
| 8 #include <vector> | 8 #include <vector> | 
| 9 | 9 | 
| 10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" | 
| (...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 168 { "changeHomePage", IDS_OPTIONS_CHANGE_HOME_PAGE }, | 168 { "changeHomePage", IDS_OPTIONS_CHANGE_HOME_PAGE }, | 
| 169 { "certificatesManageButton", IDS_OPTIONS_CERTIFICATES_MANAGE_BUTTON }, | 169 { "certificatesManageButton", IDS_OPTIONS_CERTIFICATES_MANAGE_BUTTON }, | 
| 170 { "customizeSync", IDS_OPTIONS2_CUSTOMIZE_SYNC_BUTTON_LABEL }, | 170 { "customizeSync", IDS_OPTIONS2_CUSTOMIZE_SYNC_BUTTON_LABEL }, | 
| 171 { "defaultFontSizeLabel", IDS_OPTIONS_DEFAULT_FONT_SIZE_LABEL }, | 171 { "defaultFontSizeLabel", IDS_OPTIONS_DEFAULT_FONT_SIZE_LABEL }, | 
| 172 { "defaultSearchManageEngines", IDS_OPTIONS_DEFAULTSEARCH_MANAGE_ENGINES }, | 172 { "defaultSearchManageEngines", IDS_OPTIONS_DEFAULTSEARCH_MANAGE_ENGINES }, | 
| 173 { "defaultZoomFactorLabel", IDS_OPTIONS_DEFAULT_ZOOM_LEVEL_LABEL }, | 173 { "defaultZoomFactorLabel", IDS_OPTIONS_DEFAULT_ZOOM_LEVEL_LABEL }, | 
| 174 #if defined(OS_CHROMEOS) | 174 #if defined(OS_CHROMEOS) | 
| 175 { "disableGData", IDS_OPTIONS_DISABLE_GDATA }, | 175 { "disableGData", IDS_OPTIONS_DISABLE_GDATA }, | 
| 176 #endif | 176 #endif | 
| 177 { "disableWebServices", IDS_OPTIONS_DISABLE_WEB_SERVICES }, | 177 { "disableWebServices", IDS_OPTIONS_DISABLE_WEB_SERVICES }, | 
| 178 { "displayOptionsTitle", IDS_OPTIONS_SETTINGS_SECTION_TITLE_DISPLAY }, | |
| 179 { "displayOptionsButton", IDS_OPTIONS_SETTINGS_DISPLAY_OPTIONS_BUTTON }, | |
| 
yoshiki
2012/06/15 10:21:28
Alphabetical order?
 
Jun Mukai
2012/06/18 01:15:10
Done.
 | |
| 178 { "downloadLocationAskForSaveLocation", | 180 { "downloadLocationAskForSaveLocation", | 
| 179 IDS_OPTIONS_DOWNLOADLOCATION_ASKFORSAVELOCATION }, | 181 IDS_OPTIONS_DOWNLOADLOCATION_ASKFORSAVELOCATION }, | 
| 180 { "downloadLocationBrowseTitle", | 182 { "downloadLocationBrowseTitle", | 
| 181 IDS_OPTIONS_DOWNLOADLOCATION_BROWSE_TITLE }, | 183 IDS_OPTIONS_DOWNLOADLOCATION_BROWSE_TITLE }, | 
| 182 { "downloadLocationChangeButton", | 184 { "downloadLocationChangeButton", | 
| 183 IDS_OPTIONS_DOWNLOADLOCATION_CHANGE_BUTTON }, | 185 IDS_OPTIONS_DOWNLOADLOCATION_CHANGE_BUTTON }, | 
| 184 { "downloadLocationGroupName", IDS_OPTIONS_DOWNLOADLOCATION_GROUP_NAME }, | 186 { "downloadLocationGroupName", IDS_OPTIONS_DOWNLOADLOCATION_GROUP_NAME }, | 
| 185 { "enableLogging", IDS_OPTIONS_ENABLE_LOGGING }, | 187 { "enableLogging", IDS_OPTIONS_ENABLE_LOGGING }, | 
| 186 { "fontSettingsCustomizeFontsButton", | 188 { "fontSettingsCustomizeFontsButton", | 
| 187 IDS_OPTIONS_FONTSETTINGS_CUSTOMIZE_FONTS_BUTTON }, | 189 IDS_OPTIONS_FONTSETTINGS_CUSTOMIZE_FONTS_BUTTON }, | 
| (...skipping 1225 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1413 } | 1415 } | 
| 1414 | 1416 | 
| 1415 void BrowserOptionsHandler::SetupSSLConfigSettings() { | 1417 void BrowserOptionsHandler::SetupSSLConfigSettings() { | 
| 1416 base::FundamentalValue checked(rev_checking_enabled_.GetValue()); | 1418 base::FundamentalValue checked(rev_checking_enabled_.GetValue()); | 
| 1417 base::FundamentalValue disabled(rev_checking_enabled_.IsManaged()); | 1419 base::FundamentalValue disabled(rev_checking_enabled_.IsManaged()); | 
| 1418 web_ui()->CallJavascriptFunction( | 1420 web_ui()->CallJavascriptFunction( | 
| 1419 "BrowserOptions.setCheckRevocationCheckboxState", checked, disabled); | 1421 "BrowserOptions.setCheckRevocationCheckboxState", checked, disabled); | 
| 1420 } | 1422 } | 
| 1421 | 1423 | 
| 1422 } // namespace options2 | 1424 } // namespace options2 | 
| OLD | NEW |