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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chrome/browser/resources/options/sync_section.html

Issue 11276006: Add Chrome OS-specific controlled setting indicators (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Mark DeviceMetricsReporting policy as official only. Created 8 years, 1 month 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 | « chrome/browser/resources/options/chromeos/accounts_options.js ('k') | chrome/test/data/policy/policy_test_cases.json » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <if expr="not pp_ifdef('chromeos')"> 1 <if expr="not pp_ifdef('chromeos')">
2 <section id="sync-section"> 2 <section id="sync-section">
3 <h3 i18n-content="sectionTitleSync"></h3> 3 <h3 i18n-content="sectionTitleSync"></h3>
4 </if> 4 </if>
5 <if expr="pp_ifdef('chromeos')"> 5 <if expr="pp_ifdef('chromeos')">
6 <div id="sync-section"> 6 <div id="sync-section">
7 </if> 7 </if>
8 8
9 <div id="sync-overview" class="settings-row" hidden> 9 <div id="sync-overview" class="settings-row" hidden>
10 <p i18n-content="syncOverview"></p> 10 <p i18n-content="syncOverview"></p>
11 <a i18n-values="href:syncLearnMoreURL" i18n-content="learnMore" 11 <a i18n-values="href:syncLearnMoreURL" i18n-content="learnMore"
12 target="_blank"></a> 12 target="_blank"></a>
13 </div> 13 </div>
14 14
15 <if expr="pp_ifdef('chromeos')"> 15 <if expr="pp_ifdef('chromeos')">
16 <div id="account-picture-wrapper"> 16 <div id="account-picture-wrapper">
17 <img id="account-picture"> 17 <img id="account-picture">
18 <div id="change-picture-caption" i18n-content="changePicture"></div> 18 <div id="change-picture-caption" i18n-content="changePicture"></div>
19 </div> 19 </div>
20 <div id="sync-general"> 20 <div id="sync-general">
21 </if> <!-- pp_ifdef('chromeos') --> 21 </if> <!-- pp_ifdef('chromeos') -->
22 22
23 <div id="sync-status" class="settings-row" hidden> 23 <div id="sync-status" class="settings-row" hidden>
24 <span id="sync-status-text"></span> 24 <span id="sync-status-text"></span>
25 <button id="sync-action-link" class="link-button"></button> 25 <button id="sync-action-link" class="link-button"></button>
26 </div> 26 </div>
27 27
28 <if expr="pp_ifdef('chromeos')"> 28 <if expr="pp_ifdef('chromeos')">
29 <div class="checkbox"> 29 <div class="checkbox">
30 <label> 30 <span class="controlled-setting-with-label">
31 <input id="enable-screen-lock" type="checkbox" 31 <input id="enable-screen-lock" type="checkbox"
32 pref="settings.enable_screen_lock"> 32 pref="settings.enable_screen_lock">
33 <span i18n-content="enableScreenlock"></span> 33 <span>
34 </label> 34 <label for=enable-screen-lock" i18n-content="enableScreenlock">
35 </label>
36 <span class="controlled-setting-indicator"
37 pref="settings.enable_screen_lock">
38 </span>
39 </span>
40 </span>
35 </div> 41 </div>
36 </div> 42 </div>
37 </if> <!-- pp_ifdef('chromeos') --> 43 </if> <!-- pp_ifdef('chromeos') -->
38 44
39 <div id="sync-buttons" class="settings-row"> 45 <div id="sync-buttons" class="settings-row">
40 <button id="start-stop-sync" hidden></button> 46 <button id="start-stop-sync" hidden></button>
41 <button id="customize-sync" i18n-content="customizeSync" hidden> 47 <button id="customize-sync" i18n-content="customizeSync" hidden>
42 </button> 48 </button>
43 <if expr="pp_ifdef('chromeos')"> 49 <if expr="pp_ifdef('chromeos')">
44 <button id="manage-accounts-button" 50 <button id="manage-accounts-button"
45 i18n-content="manageAccountsButtonTitle"> 51 i18n-content="manageAccountsButtonTitle">
46 </button> 52 </button>
47 </if> <!-- pp_ifdef('chromeos') --> 53 </if> <!-- pp_ifdef('chromeos') -->
48 <div id="enable-auto-login-checkbox" class="checkbox" hidden> 54 <div id="enable-auto-login-checkbox" class="checkbox" hidden>
49 <label> 55 <label>
50 <input id="enable-auto-login" pref="autologin.enabled" 56 <input id="enable-auto-login" pref="autologin.enabled"
51 metric="Options_Autologin" type="checkbox"> 57 metric="Options_Autologin" type="checkbox">
52 <span i18n-content="autologinEnabled"></span> 58 <span i18n-content="autologinEnabled"></span>
53 </label> 59 </label>
54 </div> 60 </div>
55 </div> 61 </div>
56 62
57 <if expr="not pp_ifdef('chromeos')"> 63 <if expr="not pp_ifdef('chromeos')">
58 </section> 64 </section>
59 </if> 65 </if>
60 <if expr="pp_ifdef('chromeos')"> 66 <if expr="pp_ifdef('chromeos')">
61 </div> 67 </div>
62 </if> 68 </if>
OLDNEW
« no previous file with comments | « chrome/browser/resources/options/chromeos/accounts_options.js ('k') | chrome/test/data/policy/policy_test_cases.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698