Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(46)

Side by Side Diff: chrome/browser/resources/options/advanced_options.js

Issue 6342013: Fix the regression caused by r72061. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/chrome/browser/resources/options
Patch Set: Fix unexpected tabs. 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 | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 cr.define('options', function() { 5 cr.define('options', function() {
6 6
7 var OptionsPage = options.OptionsPage; 7 var OptionsPage = options.OptionsPage;
8 8
9 // 9 //
10 // AdvancedOptions class 10 // AdvancedOptions class
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 42
43 // 'metricsReportingEnabled' element is only present on Chrome branded 43 // 'metricsReportingEnabled' element is only present on Chrome branded
44 // builds. 44 // builds.
45 if ($('metricsReportingEnabled')) { 45 if ($('metricsReportingEnabled')) {
46 $('metricsReportingEnabled').onclick = function(event) { 46 $('metricsReportingEnabled').onclick = function(event) {
47 chrome.send('metricsReportingCheckboxAction', 47 chrome.send('metricsReportingCheckboxAction',
48 [String(event.target.checked)]); 48 [String(event.target.checked)]);
49 }; 49 };
50 } 50 }
51 51
52 $('autoOpenFileTypesResetToDefault').onclick = function(event) { 52 if (!cr.isChromeOS) {
53 chrome.send('autoOpenFileTypesAction'); 53 $('autoOpenFileTypesResetToDefault').onclick = function(event) {
54 }; 54 chrome.send('autoOpenFileTypesAction');
55 };
56 }
57
55 $('fontSettingsCustomizeFontsButton').onclick = function(event) { 58 $('fontSettingsCustomizeFontsButton').onclick = function(event) {
56 OptionsPage.showPageByName('fontSettings'); 59 OptionsPage.showPageByName('fontSettings');
57 chrome.send('coreOptionsUserMetricsAction', ['Options_FontSettings']); 60 chrome.send('coreOptionsUserMetricsAction', ['Options_FontSettings']);
58 }; 61 };
59 $('defaultFontSize').onchange = function(event) { 62 $('defaultFontSize').onchange = function(event) {
60 chrome.send('defaultFontSizeAction', 63 chrome.send('defaultFontSizeAction',
61 [String(event.target.options[event.target.selectedIndex].value)]); 64 [String(event.target.options[event.target.selectedIndex].value)]);
62 }; 65 };
63 $('language-button').onclick = function(event) { 66 $('language-button').onclick = function(event) {
64 OptionsPage.showPageByName('language'); 67 OptionsPage.showPageByName('language');
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
194 }; 197 };
195 198
196 // Set the download path. 199 // Set the download path.
197 AdvancedOptions.SetDownloadLocationPath = function(path) { 200 AdvancedOptions.SetDownloadLocationPath = function(path) {
198 if (!cr.isChromeOS) 201 if (!cr.isChromeOS)
199 $('downloadLocationPath').value = path; 202 $('downloadLocationPath').value = path;
200 }; 203 };
201 204
202 // Set the enabled state for the autoOpenFileTypesResetToDefault button. 205 // Set the enabled state for the autoOpenFileTypesResetToDefault button.
203 AdvancedOptions.SetAutoOpenFileTypesDisabledAttribute = function(disabled) { 206 AdvancedOptions.SetAutoOpenFileTypesDisabledAttribute = function(disabled) {
204 $('autoOpenFileTypesResetToDefault').disabled = disabled; 207 if (!cr.isChromeOS)
208 $('autoOpenFileTypesResetToDefault').disabled = disabled;
205 }; 209 };
206 210
207 // Set the enabled state for the proxy settings button. 211 // Set the enabled state for the proxy settings button.
208 AdvancedOptions.SetupProxySettingsSection = function(disabled, label) { 212 AdvancedOptions.SetupProxySettingsSection = function(disabled, label) {
209 $('proxiesConfigureButton').disabled = disabled; 213 $('proxiesConfigureButton').disabled = disabled;
210 $('proxiesLabel').textContent = label; 214 $('proxiesLabel').textContent = label;
211 }; 215 };
212 216
213 // Set the checked state for the sslCheckRevocation checkbox. 217 // Set the checked state for the sslCheckRevocation checkbox.
214 AdvancedOptions.SetCheckRevocationCheckboxState = function( 218 AdvancedOptions.SetCheckRevocationCheckboxState = function(
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
269 if (proxySectionElm) 273 if (proxySectionElm)
270 proxySectionElm.parentNode.removeChild(proxySectionElm); 274 proxySectionElm.parentNode.removeChild(proxySectionElm);
271 }; 275 };
272 276
273 // Export 277 // Export
274 return { 278 return {
275 AdvancedOptions: AdvancedOptions 279 AdvancedOptions: AdvancedOptions
276 }; 280 };
277 281
278 }); 282 });
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698