OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/options/advanced_options_handler.h" | 5 #include "chrome/browser/ui/webui/options/advanced_options_handler.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 252 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
263 rev_checking_enabled_.Init(prefs::kCertRevocationCheckingEnabled, | 263 rev_checking_enabled_.Init(prefs::kCertRevocationCheckingEnabled, |
264 g_browser_process->local_state(), this); | 264 g_browser_process->local_state(), this); |
265 | 265 |
266 #if !defined(OS_MACOSX) && !defined(OS_CHROMEOS) | 266 #if !defined(OS_MACOSX) && !defined(OS_CHROMEOS) |
267 background_mode_enabled_.Init(prefs::kBackgroundModeEnabled, | 267 background_mode_enabled_.Init(prefs::kBackgroundModeEnabled, |
268 g_browser_process->local_state(), | 268 g_browser_process->local_state(), |
269 this); | 269 this); |
270 #endif | 270 #endif |
271 | 271 |
272 auto_open_files_.Init(prefs::kDownloadExtensionsToOpen, prefs, this); | 272 auto_open_files_.Init(prefs::kDownloadExtensionsToOpen, prefs, this); |
273 default_font_size_.Init(prefs::kWebKitDefaultFontSize, prefs, this); | 273 default_font_size_.Init(prefs::kWebKitGlobalDefaultFontSize, prefs, this); |
274 default_zoom_level_.Init(prefs::kDefaultZoomLevel, prefs, this); | 274 default_zoom_level_.Init(prefs::kDefaultZoomLevel, prefs, this); |
275 #if !defined(OS_CHROMEOS) | 275 #if !defined(OS_CHROMEOS) |
276 proxy_prefs_.reset( | 276 proxy_prefs_.reset( |
277 PrefSetObserver::CreateProxyPrefSetObserver(prefs, this)); | 277 PrefSetObserver::CreateProxyPrefSetObserver(prefs, this)); |
278 #endif // !defined(OS_CHROMEOS) | 278 #endif // !defined(OS_CHROMEOS) |
279 | 279 |
280 // Return result from the superclass. | 280 // Return result from the superclass. |
281 return handler; | 281 return handler; |
282 } | 282 } |
283 | 283 |
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
343 #if !defined(OS_CHROMEOS) | 343 #if !defined(OS_CHROMEOS) |
344 } else if (proxy_prefs_->IsObserved(*pref_name)) { | 344 } else if (proxy_prefs_->IsObserved(*pref_name)) { |
345 SetupProxySettingsSection(); | 345 SetupProxySettingsSection(); |
346 #endif // !defined(OS_CHROMEOS) | 346 #endif // !defined(OS_CHROMEOS) |
347 } else if ((*pref_name == prefs::kCloudPrintEmail) || | 347 } else if ((*pref_name == prefs::kCloudPrintEmail) || |
348 (*pref_name == prefs::kCloudPrintProxyEnabled)) { | 348 (*pref_name == prefs::kCloudPrintProxyEnabled)) { |
349 #if !defined(OS_CHROMEOS) | 349 #if !defined(OS_CHROMEOS) |
350 if (cloud_print_connector_ui_enabled_) | 350 if (cloud_print_connector_ui_enabled_) |
351 SetupCloudPrintConnectorSection(); | 351 SetupCloudPrintConnectorSection(); |
352 #endif | 352 #endif |
353 } else if (*pref_name == prefs::kWebKitDefaultFontSize) { | 353 } else if (*pref_name == prefs::kWebKitGlobalDefaultFontSize) { |
354 SetupFontSizeSelector(); | 354 SetupFontSizeSelector(); |
355 } else if (*pref_name == prefs::kDefaultZoomLevel) { | 355 } else if (*pref_name == prefs::kDefaultZoomLevel) { |
356 SetupPageZoomSelector(); | 356 SetupPageZoomSelector(); |
357 #if !defined(OS_MACOSX) && !defined(OS_CHROMEOS) | 357 #if !defined(OS_MACOSX) && !defined(OS_CHROMEOS) |
358 } else if (*pref_name == prefs::kBackgroundModeEnabled) { | 358 } else if (*pref_name == prefs::kBackgroundModeEnabled) { |
359 SetupBackgroundModeSettings(); | 359 SetupBackgroundModeSettings(); |
360 #endif | 360 #endif |
361 } | 361 } |
362 } | 362 } |
363 } | 363 } |
(...skipping 295 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
659 | 659 |
660 void AdvancedOptionsHandler::SetupSSLConfigSettings() { | 660 void AdvancedOptionsHandler::SetupSSLConfigSettings() { |
661 { | 661 { |
662 base::FundamentalValue checked(rev_checking_enabled_.GetValue()); | 662 base::FundamentalValue checked(rev_checking_enabled_.GetValue()); |
663 base::FundamentalValue disabled(rev_checking_enabled_.IsManaged()); | 663 base::FundamentalValue disabled(rev_checking_enabled_.IsManaged()); |
664 web_ui_->CallJavascriptFunction( | 664 web_ui_->CallJavascriptFunction( |
665 "options.AdvancedOptions.SetCheckRevocationCheckboxState", checked, | 665 "options.AdvancedOptions.SetCheckRevocationCheckboxState", checked, |
666 disabled); | 666 disabled); |
667 } | 667 } |
668 } | 668 } |
OLD | NEW |