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_handler.h" | 5 #include "chrome/browser/ui/webui/options2/browser_options_handler.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 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
76 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" | 76 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" |
77 #include "ui/base/l10n/l10n_util.h" | 77 #include "ui/base/l10n/l10n_util.h" |
78 | 78 |
79 #if !defined(OS_CHROMEOS) | 79 #if !defined(OS_CHROMEOS) |
80 #include "chrome/browser/printing/cloud_print/cloud_print_setup_handler.h" | 80 #include "chrome/browser/printing/cloud_print/cloud_print_setup_handler.h" |
81 #include "chrome/browser/ui/webui/options2/advanced_options_utils.h" | 81 #include "chrome/browser/ui/webui/options2/advanced_options_utils.h" |
82 #endif | 82 #endif |
83 | 83 |
84 #if defined(OS_CHROMEOS) | 84 #if defined(OS_CHROMEOS) |
85 #include "chrome/browser/chromeos/accessibility/accessibility_util.h" | 85 #include "chrome/browser/chromeos/accessibility/accessibility_util.h" |
86 #include "chrome/browser/chromeos/extensions/wallpaper_manager_api.h" | 86 #include "chrome/browser/chromeos/cros_settings.h" |
| 87 #include "chrome/browser/chromeos/extensions/wallpaper_manager_util.h" |
87 #include "chrome/browser/chromeos/login/user_manager.h" | 88 #include "chrome/browser/chromeos/login/user_manager.h" |
88 #include "chrome/browser/chromeos/options/take_photo_dialog.h" | 89 #include "chrome/browser/chromeos/options/take_photo_dialog.h" |
89 #include "chrome/browser/ui/browser_window.h" | 90 #include "chrome/browser/ui/browser_window.h" |
90 #include "chrome/browser/ui/webui/options2/chromeos/timezone_options_util.h" | 91 #include "chrome/browser/ui/webui/options2/chromeos/timezone_options_util.h" |
91 #include "ui/gfx/image/image_skia.h" | 92 #include "ui/gfx/image/image_skia.h" |
92 #endif // defined(OS_CHROMEOS) | 93 #endif // defined(OS_CHROMEOS) |
93 | 94 |
94 #if defined(OS_WIN) | 95 #if defined(OS_WIN) |
95 #include "chrome/installer/util/auto_launch_util.h" | 96 #include "chrome/installer/util/auto_launch_util.h" |
96 #endif // defined(OS_WIN) | 97 #endif // defined(OS_WIN) |
(...skipping 1352 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1449 } | 1450 } |
1450 | 1451 |
1451 void BrowserOptionsHandler::SetupSSLConfigSettings() { | 1452 void BrowserOptionsHandler::SetupSSLConfigSettings() { |
1452 base::FundamentalValue checked(rev_checking_enabled_.GetValue()); | 1453 base::FundamentalValue checked(rev_checking_enabled_.GetValue()); |
1453 base::FundamentalValue disabled(rev_checking_enabled_.IsManaged()); | 1454 base::FundamentalValue disabled(rev_checking_enabled_.IsManaged()); |
1454 web_ui()->CallJavascriptFunction( | 1455 web_ui()->CallJavascriptFunction( |
1455 "BrowserOptions.setCheckRevocationCheckboxState", checked, disabled); | 1456 "BrowserOptions.setCheckRevocationCheckboxState", checked, disabled); |
1456 } | 1457 } |
1457 | 1458 |
1458 } // namespace options2 | 1459 } // namespace options2 |
OLD | NEW |