chrome/browser/resources/settings/site_settings_page/site_settings_page.html - Issue 2677003004: MD Settings: Make Protected Content setting available to all platforms.

Side by Side Diff: chrome/browser/resources/settings/site_settings_page/site_settings_page.html

Issue 2677003004: MD Settings: Make Protected Content setting available to all platforms. (Closed)

Patch Set: Merge branch 'master' of https://chromium.googlesource.com/chromium/src into 399-settings-make-enab… Created 3 years, 10 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

« no previous file with comments | « chrome/browser/resources/settings/settings_resources.grd ('k') | no next file » | no next file with comments »

OLD	NEW
1 <link rel="import" href="chrome://resources/html/polymer.html">	1 <link rel="import" href="chrome://resources/html/polymer.html">

2 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">	2 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">

3 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html">	3 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html">

4 <link rel="import" href="../icons.html">	4 <link rel="import" href="../icons.html">

5 <link rel="import" href="../route.html">	5 <link rel="import" href="../route.html">

6 <link rel="import" href="../settings_shared_css.html">	6 <link rel="import" href="../settings_shared_css.html">

7 <link rel="import" href="../site_settings/constants.html">	7 <link rel="import" href="../site_settings/constants.html">

8 <link rel="import" href="../site_settings/site_settings_behavior.html">	8 <link rel="import" href="../site_settings/site_settings_behavior.html">

9 <link rel="import" href="../site_settings/site_settings_prefs_browser_proxy.html ">	9 <link rel="import" href="../site_settings/site_settings_prefs_browser_proxy.html ">

10	10

(...skipping 227 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
238 <iron-icon icon="settings:usb"></iron-icon>	238 <iron-icon icon="settings:usb"></iron-icon>

239 <div class="middle">$i18n{siteSettingsUsbDevices}</div>	239 <div class="middle">$i18n{siteSettingsUsbDevices}</div>

240 <button class="subpage-arrow" is="paper-icon-button-light"></button>	240 <button class="subpage-arrow" is="paper-icon-button-light"></button>

241 </div>	241 </div>

242 <div class="settings-box" data-route="SITE_SETTINGS_PDF_DOCUMENTS"	242 <div class="settings-box" data-route="SITE_SETTINGS_PDF_DOCUMENTS"

243 on-tap="onTapNavigate_" actionable>	243 on-tap="onTapNavigate_" actionable>

244 <iron-icon icon="settings:pdf"></iron-icon>	244 <iron-icon icon="settings:pdf"></iron-icon>

245 <div class="middle">$i18n{siteSettingsPdfDocuments}</div>	245 <div class="middle">$i18n{siteSettingsPdfDocuments}</div>

246 <button class="subpage-arrow" is="paper-icon-button-light"></button>	246 <button class="subpage-arrow" is="paper-icon-button-light"></button>

247 </div>	247 </div>

248 <if expr="chromeos or is_win">

249 <div class="settings-box" data-route="SITE_SETTINGS_PROTECTED_CONTENT"	248 <div class="settings-box" data-route="SITE_SETTINGS_PROTECTED_CONTENT"

250 on-tap="onTapNavigate_" actionable>	249 on-tap="onTapNavigate_" actionable>

251 <iron-icon icon="settings:security"></iron-icon>	250 <iron-icon icon="settings:security"></iron-icon>

252 <div class="middle">$i18n{siteSettingsProtectedContent}</div>	251 <div class="middle">$i18n{siteSettingsProtectedContent}</div>

253 <button class="subpage-arrow" is="paper-icon-button-light"></button>	252 <button class="subpage-arrow" is="paper-icon-button-light"></button>

254 </div>	253 </div>

255 </if>

256 </template>	254 </template>

257 <script src="site_settings_page.js"></script>	255 <script src="site_settings_page.js"></script>

258 </dom-module>	256 </dom-module>

OLD	NEW