chrome/browser/dom_ui/options/advanced_options_handler.cc - Issue 6342020: dom-ui settings: Layout tweaks to bring Under the Hood closer to mocks....

Side by Side Diff: chrome/browser/dom_ui/options/advanced_options_handler.cc

Issue 6342020: dom-ui settings: Layout tweaks to bring Under the Hood closer to mocks.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: '' Created 9 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « no previous file | chrome/browser/resources/options/advanced_options.css » ('j') | no next file with comments »

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/dom_ui/options/advanced_options_handler.h"	5 #include "chrome/browser/dom_ui/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/callback.h"	10 #include "base/callback.h"

(...skipping 65 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
76 localized_strings->SetString("downloadLocationBrowseWindowTitle",	76 localized_strings->SetString("downloadLocationBrowseWindowTitle",

77 l10n_util::GetStringUTF16(	77 l10n_util::GetStringUTF16(

78 IDS_OPTIONS_DOWNLOADLOCATION_BROWSE_WINDOW_TITLE));	78 IDS_OPTIONS_DOWNLOADLOCATION_BROWSE_WINDOW_TITLE));

79 localized_strings->SetString("downloadLocationAskForSaveLocation",	79 localized_strings->SetString("downloadLocationAskForSaveLocation",

80 l10n_util::GetStringUTF16(	80 l10n_util::GetStringUTF16(

81 IDS_OPTIONS_DOWNLOADLOCATION_ASKFORSAVELOCATION));	81 IDS_OPTIONS_DOWNLOADLOCATION_ASKFORSAVELOCATION));

82 localized_strings->SetString("autoOpenFileTypesInfo",	82 localized_strings->SetString("autoOpenFileTypesInfo",

83 l10n_util::GetStringUTF16(IDS_OPTIONS_OPEN_FILE_TYPES_AUTOMATICALLY));	83 l10n_util::GetStringUTF16(IDS_OPTIONS_OPEN_FILE_TYPES_AUTOMATICALLY));

84 localized_strings->SetString("autoOpenFileTypesResetToDefault",	84 localized_strings->SetString("autoOpenFileTypesResetToDefault",

85 l10n_util::GetStringUTF16(IDS_OPTIONS_AUTOOPENFILETYPES_RESETTODEFAULT));	85 l10n_util::GetStringUTF16(IDS_OPTIONS_AUTOOPENFILETYPES_RESETTODEFAULT));

86 localized_strings->SetString("gearSettingsGroupName",

87 dom_options_util::StripColon(

88 l10n_util::GetStringUTF16(IDS_OPTIONS_GEARSSETTINGS_GROUP_NAME)));

89 localized_strings->SetString("gearSettingsConfigureGearsButton",	86 localized_strings->SetString("gearSettingsConfigureGearsButton",

90 l10n_util::GetStringUTF16(	87 l10n_util::GetStringUTF16(

91 IDS_OPTIONS_GEARSSETTINGS_CONFIGUREGEARS_BUTTON));	88 IDS_OPTIONS_GEARSSETTINGS_CONFIGUREGEARS_BUTTON));

92 localized_strings->SetString("translateEnableTranslate",	89 localized_strings->SetString("translateEnableTranslate",

93 l10n_util::GetStringUTF16(IDS_OPTIONS_TRANSLATE_ENABLE_TRANSLATE));	90 l10n_util::GetStringUTF16(IDS_OPTIONS_TRANSLATE_ENABLE_TRANSLATE));

94 localized_strings->SetString("certificatesManageButton",	91 localized_strings->SetString("certificatesManageButton",

95 l10n_util::GetStringUTF16(IDS_OPTIONS_CERTIFICATES_MANAGE_BUTTON));	92 l10n_util::GetStringUTF16(IDS_OPTIONS_CERTIFICATES_MANAGE_BUTTON));

96 localized_strings->SetString("proxiesLabel",	93 localized_strings->SetString("proxiesLabel",

97 l10n_util::GetStringUTF16(IDS_OPTIONS_PROXIES_LABEL));	94 l10n_util::GetStringUTF16(IDS_OPTIONS_PROXIES_LABEL));

98 localized_strings->SetString("proxiesConfigureButton",	95 localized_strings->SetString("proxiesConfigureButton",

(...skipping 524 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
623 FundamentalValue useSSL3Value(useSSL3Setting);	620 FundamentalValue useSSL3Value(useSSL3Setting);

624 dom_ui_->CallJavascriptFunction(	621 dom_ui_->CallJavascriptFunction(

625 L"options.AdvancedOptions.SetUseSSL3CheckboxState",	622 L"options.AdvancedOptions.SetUseSSL3CheckboxState",

626 useSSL3Value, disabledValue);	623 useSSL3Value, disabledValue);

627 FundamentalValue useTLS1Value(useTLS1Setting);	624 FundamentalValue useTLS1Value(useTLS1Setting);

628 dom_ui_->CallJavascriptFunction(	625 dom_ui_->CallJavascriptFunction(

629 L"options.AdvancedOptions.SetUseTLS1CheckboxState",	626 L"options.AdvancedOptions.SetUseTLS1CheckboxState",

630 useTLS1Value, disabledValue);	627 useTLS1Value, disabledValue);

631 }	628 }

632 #endif	629 #endif

OLD	NEW