Skip to content

Commit

Permalink
Added "controlled by" indicators for mouselock and ppapi broker.
Browse files Browse the repository at this point in the history
These settings were originally not manageable by extensions (or other means), and therefore had no such indicators.

Screenshots are attached to the linked bug.

BUG=459141

Review URL: https://codereview.chromium.org/928373002

Cr-Commit-Position: refs/heads/master@{#316568}
  • Loading branch information
msramek authored and Commit bot committed Feb 17, 2015
1 parent c6605bd commit bf2829d
Showing 1 changed file with 30 additions and 6 deletions.
36 changes: 30 additions & 6 deletions chrome/browser/resources/options/content_settings.html
Original file line number Diff line number Diff line change
Expand Up @@ -386,19 +386,31 @@ <h3 i18n-content="mouselockTabLabel"></h3>
<div class="radio">
<label>
<input type="radio" name="mouselock" value="allow">
<span i18n-content="mouselockAllow"></span>
<span>
<span i18n-content="mouselockAllow"></span>
<span class="controlled-setting-indicator"
content-setting="mouselock" value="allow"></span>
</span>
</label>
</div>
<div class="radio">
<label>
<input type="radio" name="mouselock" value="ask">
<span i18n-content="mouselockAsk"></span>
<span>
<span i18n-content="mouselockAsk"></span>
<span class="controlled-setting-indicator"
content-setting="mouselock" value="ask"></span>
</span>
</label>
</div>
<div class="radio">
<label>
<input type="radio" name="mouselock" value="block">
<span i18n-content="mouselockBlock"></span>
<span>
<span i18n-content="mouselockBlock"></span>
<span class="controlled-setting-indicator"
content-setting="mouselock" value="block"></span>
</span>
</label>
</div>
<div class="settings-row">
Expand Down Expand Up @@ -499,19 +511,31 @@ <h3 i18n-content="ppapiBrokerTabLabel"></h3>
<div class="radio">
<label>
<input type="radio" name="ppapi-broker" value="allow">
<span i18n-content="ppapiBrokerAllow"></span>
<span>
<span i18n-content="ppapiBrokerAllow"></span>
<span class="controlled-setting-indicator"
content-setting="ppapi-broker" value="allow"></span>
</span>
</label>
</div>
<div class="radio">
<label>
<input type="radio" name="ppapi-broker" value="ask">
<span i18n-content="ppapiBrokerAsk"></span>
<span>
<span i18n-content="ppapiBrokerAsk"></span>
<span class="controlled-setting-indicator"
content-setting="ppapi-broker" value="ask"></span>
</span>
</label>
</div>
<div class="radio">
<label>
<input type="radio" name="ppapi-broker" value="block">
<span i18n-content="ppapiBrokerBlock"></span>
<span>
<span i18n-content="ppapiBrokerBlock"></span>
<span class="controlled-setting-indicator"
content-setting="ppapi-broker" value="block"></span>
</span>
</label>
</div>
<div class="settings-row">
Expand Down

0 comments on commit bf2829d

Please sign in to comment.