diff options
| author | sreeram@chromium.org <sreeram@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-02 17:43:38 +0000 |
|---|---|---|
| committer | sreeram@chromium.org <sreeram@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-02 17:43:38 +0000 |
| commit | b153c8f17b1a91559f8410530edbee1c66e04475 (patch) | |
| tree | b93b800eccf37729e8c6919aec234c258c5da99d | |
| parent | 2dc149b799c69a6594d426385852503a679e4c4d (diff) | |
| download | chromium_src-b153c8f17b1a91559f8410530edbee1c66e04475.zip chromium_src-b153c8f17b1a91559f8410530edbee1c66e04475.tar.gz chromium_src-b153c8f17b1a91559f8410530edbee1c66e04475.tar.bz2 | |
Merge 107818 - Associate the instant label text with a specific checkbox.
I've tested this using all combinations of field trials (both naturally
selected as well as forced through the --instant-field-trial commandline
switch), and everything works as expected.
BUG=101930
TEST=Clicking on the label text should turn the checkbox on/off.
Review URL: http://codereview.chromium.org/8400044
TBR=sreeram@chromium.org
Review URL: http://codereview.chromium.org/8438044
git-svn-id: svn://svn.chromium.org/chrome/branches/912/src@108316 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/resources/options/browser_options.html | 2 | ||||
| -rw-r--r-- | chrome/browser/resources/options/browser_options.js | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser/resources/options/browser_options.html b/chrome/browser/resources/options/browser_options.html index 8e4fe21..35ec7ae 100644 --- a/chrome/browser/resources/options/browser_options.html +++ b/chrome/browser/resources/options/browser_options.html @@ -97,7 +97,7 @@ i18n-content="defaultSearchManageEngines"></button> </div> <div id="instantOption" class="checkbox"> - <label> + <label id="instantLabel"> <!-- TODO(estade): metric? --> <input id="instantFieldTrialCheckbox" type="checkbox" checked="checked" hidden> diff --git a/chrome/browser/resources/options/browser_options.js b/chrome/browser/resources/options/browser_options.js index 2f0db8a..4fe383d 100644 --- a/chrome/browser/resources/options/browser_options.js +++ b/chrome/browser/resources/options/browser_options.js @@ -171,6 +171,8 @@ cr.define('options', function() { setInstantFieldTrialStatus_: function(enabled) { $('instantEnabledCheckbox').hidden = enabled; $('instantFieldTrialCheckbox').hidden = !enabled; + $('instantLabel').htmlFor = enabled ? 'instantFieldTrialCheckbox' + : 'instantEnabledCheckbox'; }, /** |