| 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 711 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 722 int BrowserOptionsHandler::StatusStringIdForState( | 722 int BrowserOptionsHandler::StatusStringIdForState( |
| 723 ShellIntegration::DefaultWebClientState state) { | 723 ShellIntegration::DefaultWebClientState state) { |
| 724 if (state == ShellIntegration::IS_DEFAULT_WEB_CLIENT) | 724 if (state == ShellIntegration::IS_DEFAULT_WEB_CLIENT) |
| 725 return IDS_OPTIONS_DEFAULTBROWSER_DEFAULT; | 725 return IDS_OPTIONS_DEFAULTBROWSER_DEFAULT; |
| 726 if (state == ShellIntegration::NOT_DEFAULT_WEB_CLIENT) | 726 if (state == ShellIntegration::NOT_DEFAULT_WEB_CLIENT) |
| 727 return IDS_OPTIONS_DEFAULTBROWSER_NOTDEFAULT; | 727 return IDS_OPTIONS_DEFAULTBROWSER_NOTDEFAULT; |
| 728 return IDS_OPTIONS_DEFAULTBROWSER_UNKNOWN; | 728 return IDS_OPTIONS_DEFAULTBROWSER_UNKNOWN; |
| 729 } | 729 } |
| 730 | 730 |
| 731 void BrowserOptionsHandler::SetDefaultWebClientUIState( | 731 void BrowserOptionsHandler::SetDefaultWebClientUIState( |
| 732 ShellIntegration::DefaultWebClientUIState state) { | 732 ShellIntegration::DefaultWebClientUIState state, |
| 733 ShellIntegration::SetDefaultWebClientResult unused_result) { |
| 733 int status_string_id; | 734 int status_string_id; |
| 734 if (state == ShellIntegration::STATE_IS_DEFAULT) | 735 if (state == ShellIntegration::STATE_IS_DEFAULT) |
| 735 status_string_id = IDS_OPTIONS_DEFAULTBROWSER_DEFAULT; | 736 status_string_id = IDS_OPTIONS_DEFAULTBROWSER_DEFAULT; |
| 736 else if (state == ShellIntegration::STATE_NOT_DEFAULT) | 737 else if (state == ShellIntegration::STATE_NOT_DEFAULT) |
| 737 status_string_id = IDS_OPTIONS_DEFAULTBROWSER_NOTDEFAULT; | 738 status_string_id = IDS_OPTIONS_DEFAULTBROWSER_NOTDEFAULT; |
| 738 else if (state == ShellIntegration::STATE_UNKNOWN) | 739 else if (state == ShellIntegration::STATE_UNKNOWN) |
| 739 status_string_id = IDS_OPTIONS_DEFAULTBROWSER_UNKNOWN; | 740 status_string_id = IDS_OPTIONS_DEFAULTBROWSER_UNKNOWN; |
| 740 else | 741 else |
| 741 return; // Still processing. | 742 return; // Still processing. |
| 742 | 743 |
| (...skipping 670 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1413 } | 1414 } |
| 1414 | 1415 |
| 1415 void BrowserOptionsHandler::SetupSSLConfigSettings() { | 1416 void BrowserOptionsHandler::SetupSSLConfigSettings() { |
| 1416 base::FundamentalValue checked(rev_checking_enabled_.GetValue()); | 1417 base::FundamentalValue checked(rev_checking_enabled_.GetValue()); |
| 1417 base::FundamentalValue disabled(rev_checking_enabled_.IsManaged()); | 1418 base::FundamentalValue disabled(rev_checking_enabled_.IsManaged()); |
| 1418 web_ui()->CallJavascriptFunction( | 1419 web_ui()->CallJavascriptFunction( |
| 1419 "BrowserOptions.setCheckRevocationCheckboxState", checked, disabled); | 1420 "BrowserOptions.setCheckRevocationCheckboxState", checked, disabled); |
| 1420 } | 1421 } |
| 1421 | 1422 |
| 1422 } // namespace options2 | 1423 } // namespace options2 |
| OLD | NEW |