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

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

Issue 2236213002: Add quick unlock Settings in options page (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: try to fix browser tests Created 4 years, 4 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
OLDNEW
1 <if expr="not chromeos"> 1 <if expr="not 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="chromeos"> 5 <if expr="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>
(...skipping 26 matching lines...) Expand all
37 <input type="checkbox" 37 <input type="checkbox"
38 metric="Options_ScreenLock" 38 metric="Options_ScreenLock"
39 pref="settings.enable_screen_lock"> 39 pref="settings.enable_screen_lock">
40 <span> 40 <span>
41 <span i18n-content="enableScreenlock"></span> 41 <span i18n-content="enableScreenlock"></span>
42 <span class="controlled-setting-indicator" 42 <span class="controlled-setting-indicator"
43 i18n-values="textshared:screenLockShared" 43 i18n-values="textshared:screenLockShared"
44 pref="settings.enable_screen_lock"></span> 44 pref="settings.enable_screen_lock"></span>
45 </span> 45 </span>
46 </label> 46 </label>
47 <a is="action-link" id="manage-screenlock"
jdufault 2016/08/15 19:21:18 ?
xiaoyinh(OOO Sep 11-29) 2016/08/16 17:33:43 This is incorporating your previous comment to use
48 i18n-content="manageScreenlock" hidden>
49 </a>
47 </div> 50 </div>
48 </div> 51 </div>
49 </if> <!-- chromeos --> 52 </if> <!-- chromeos -->
50 53
51 <div id="sync-buttons" class="settings-row"> 54 <div id="sync-buttons" class="settings-row">
52 <button id="start-stop-sync" hidden></button> 55 <button id="start-stop-sync" hidden></button>
53 <span id="start-stop-sync-indicator" 56 <span id="start-stop-sync-indicator"
54 class="controlled-setting-indicator" hidden> 57 class="controlled-setting-indicator" hidden>
55 </span> 58 </span>
56 <button id="customize-sync" i18n-content="customizeSync" 59 <button id="customize-sync" i18n-content="customizeSync"
57 pref="sync.managed" hidden> 60 pref="sync.managed" hidden>
58 </button> 61 </button>
59 <if expr="chromeos"> 62 <if expr="chromeos">
60 <button id="manage-accounts-button" 63 <button id="manage-accounts-button"
61 public-account-visibility="hidden" 64 public-account-visibility="hidden"
62 i18n-content="manageAccountsButtonTitle"> 65 i18n-content="manageAccountsButtonTitle">
63 </button> 66 </button>
64 </if> <!-- chromeos --> 67 </if> <!-- chromeos -->
65 </div> 68 </div>
66 69
67 <if expr="not chromeos"> 70 <if expr="not chromeos">
68 </section> 71 </section>
69 </if> 72 </if>
70 <if expr="chromeos"> 73 <if expr="chromeos">
71 </div> 74 </div>
72 </if> 75 </if>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698