chrome/browser/resources/settings/site_settings_page/site_settings_page.html - Issue 2664503004: MD Settings: Make all HTML import href's relative.

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

Issue 2664503004: MD Settings: Make all HTML import href's relative. (Closed)

Patch Set: resolve more conflicts 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:

« no previous file with comments | « chrome/browser/resources/settings/site_settings/zoom_levels.html ('k') | chrome/browser/resources/settings/system_page/system_page.html » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

11 <dom-module id="settings-site-settings-page">	11 <dom-module id="settings-site-settings-page">

12 <template>	12 <template>

13 <style include="settings-shared"></style>	13 <style include="settings-shared"></style>

14 <template is="dom-if" if="[[enableSiteSettings_]]">	14 <template is="dom-if" if="[[enableSiteSettings_]]">

15 <div class="settings-box first" category$="[[ALL_SITES]]"	15 <div class="settings-box first" category$="[[ALL_SITES]]"

16 data-route="SITE_SETTINGS_ALL" on-tap="onTapNavigate_" actionable>	16 data-route="SITE_SETTINGS_ALL" on-tap="onTapNavigate_" actionable>

17 <iron-icon icon="settings:list"></iron-icon>	17 <iron-icon icon="settings:list"></iron-icon>

18 <div class="middle">$i18n{siteSettingsCategoryAllSites}</div>	18 <div class="middle">$i18n{siteSettingsCategoryAllSites}</div>

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

(...skipping 221 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
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 </template>	248 </template>

249 <script src="site_settings_page.js"></script>	249 <script src="site_settings_page.js"></script>

250 </dom-module>	250 </dom-module>

OLD	NEW