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

Side by Side Diff: chrome/browser/resources/settings/on_startup_page/startup_urls_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/on_startup_page/startup_url_entry.html ('k') | chrome/browser/resources/settings/passwords_and_forms_page/address_edit_dialog.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/action_link.html">	2 <link rel="import" href="chrome://resources/html/action_link.html">

3 <link rel="import" href="chrome://resources/html/action_link_css.html">	3 <link rel="import" href="chrome://resources/html/action_link_css.html">

4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe s/iron-flex-layout.html">	4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe s/iron-flex-layout.html">

5 <link rel="import" href="chrome://resources/polymer/v1_0/iron-list/iron-list.htm l">	5 <link rel="import" href="chrome://resources/polymer/v1_0/iron-list/iron-list.htm l">

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

7 <link rel="import" href="chrome://resources/cr_elements/cr_scrollable_behavior.h tml">	7 <link rel="import" href="chrome://resources/cr_elements/cr_scrollable_behavior.h tml">

8 <link rel="import" href="/controls/extension_controlled_indicator.html">	8 <link rel="import" href="../controls/extension_controlled_indicator.html">

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

10 <link rel="import" href="/on_startup_page/startup_url_dialog.html">	10 <link rel="import" href="startup_url_dialog.html">

11 <link rel="import" href="/on_startup_page/startup_url_entry.html">	11 <link rel="import" href="startup_url_entry.html">

12 <link rel="import" href="/on_startup_page/startup_urls_page_browser_proxy.html">	12 <link rel="import" href="startup_urls_page_browser_proxy.html">

13	13

14 <dom-module id="settings-startup-urls-page">	14 <dom-module id="settings-startup-urls-page">

15 <template>	15 <template>

16 <style include="settings-shared action-link">	16 <style include="settings-shared action-link">

17 #outer {	17 #outer {

18 @apply(--settings-list-frame-padding);	18 @apply(--settings-list-frame-padding);

19 max-height: 395px; /** Enough height to show six entries. */	19 max-height: 395px; /** Enough height to show six entries. */

20 }	20 }

21	21

22 #container iron-list > settings-startup-url-entry:not(:first-of-type) {	22 #container iron-list > settings-startup-url-entry:not(:first-of-type) {

(...skipping 41 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
64 </template>	64 </template>

65 </div>	65 </div>

66 <template is="dom-if" if="[[showStartupUrlDialog_]]" restamp>	66 <template is="dom-if" if="[[showStartupUrlDialog_]]" restamp>

67 <settings-startup-url-dialog model="[[startupUrlDialogModel_]]"	67 <settings-startup-url-dialog model="[[startupUrlDialogModel_]]"

68 on-close="destroyUrlDialog_">	68 on-close="destroyUrlDialog_">

69 </settings-startup-url-dialog>	69 </settings-startup-url-dialog>

70 </template>	70 </template>

71 </template>	71 </template>

72 <script src="startup_urls_page.js"></script>	72 <script src="startup_urls_page.js"></script>

73 </dom-module>	73 </dom-module>

OLD	NEW