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

Side by Side Diff: chrome/browser/resources/settings/search_page/search_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/search_engines_page/search_engines_page.html ('k') | chrome/browser/resources/settings/settings.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/i18n_behavior.html">	1 <link rel="import" href="chrome://resources/html/i18n_behavior.html">

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

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

4 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html">	4 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html">

5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html">	5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html">

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

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

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

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

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

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

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

13 <link rel="import" href="/search_engines_page/search_engines_browser_proxy.html" >	13 <link rel="import" href="../search_engines_page/search_engines_browser_proxy.htm l">

14 <link rel="import" href="/settings_page/settings_animated_pages.html">	14 <link rel="import" href="../settings_page/settings_animated_pages.html">

15 <link rel="import" href="/settings_page/settings_subpage.html">	15 <link rel="import" href="../settings_page/settings_subpage.html">

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

17 <link rel="import" href="/settings_vars_css.html">	17 <link rel="import" href="../settings_vars_css.html">

18	18

19 <dom-module id="settings-search-page">	19 <dom-module id="settings-search-page">

20 <template>	20 <template>

21 <style include="settings-shared md-select">	21 <style include="settings-shared md-select">

22 #search-wrapper {	22 #search-wrapper {

23 align-items: center;	23 align-items: center;

24 display: flex;	24 display: flex;

25 min-height: var(--settings-box-min-height);	25 min-height: var(--settings-box-min-height);

26 }	26 }

27	27

(...skipping 111 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
139 <settings-subpage	139 <settings-subpage

140 associated-control="[[$$('#subpage-trigger')]]"	140 associated-control="[[$$('#subpage-trigger')]]"

141 page-title="$i18n{searchEnginesManage}">	141 page-title="$i18n{searchEnginesManage}">

142 <settings-search-engines-page></settings-search-engines-page>	142 <settings-search-engines-page></settings-search-engines-page>

143 </settings-subpage>	143 </settings-subpage>

144 </template>	144 </template>

145 </settings-animated-pages>	145 </settings-animated-pages>

146 </template>	146 </template>

147 <script src="search_page.js"></script>	147 <script src="search_page.js"></script>

148 </dom-module>	148 </dom-module>

OLD	NEW