chrome/browser/resources/settings/search_engines_page/search_engines_page.html - Issue 1155683008: Rename polymer and cr_elements v0_8 to v1_0

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1155683008: Rename polymer and cr_elements v0_8 to v1_0 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@v1

Patch Set: fix a merge mistake Created 5 years, 6 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/search_engines_page/search_engines_list.html ('k') | chrome/browser/resources/settings/search_page/search_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/polymer/v0_8/polymer/polymer.html">	1 <link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.html">

2 <link rel="import" href="chrome://resources/polymer/v0_8/paper-material/paper-ma terial.html">	2 <link rel="import" href="chrome://resources/polymer/v1_0/paper-material/paper-ma terial.html">

3 <link rel="import" href="search_engine_adder.html">	3 <link rel="import" href="search_engine_adder.html">

4 <link rel="import" href="search_engines_list.html">	4 <link rel="import" href="search_engines_list.html">

5	5

6 <dom-module id="cr-settings-search-engines-page">	6 <dom-module id="cr-settings-search-engines-page">

7 <link rel="import" type="css" href="chrome://md-settings/settings_page/setting s_page.css">	7 <link rel="import" type="css" href="chrome://md-settings/settings_page/setting s_page.css">

8 <link rel="import" type="css" href="search_engines_page.css">	8 <link rel="import" type="css" href="search_engines_page.css">

9 <template>	9 <template>

10 <paper-material>	10 <paper-material>

11 <div class="content">	11 <div class="content">

12 <cr-search-engine-adder></cr-search-engine-adder>	12 <cr-search-engine-adder></cr-search-engine-adder>

13	13

14 <div class="list-label" i18n-content="searchEnginesLabel"></div>	14 <div class="list-label" i18n-content="searchEnginesLabel"></div>

15 <cr-search-engines-list engines="[[defaultEngines]]">	15 <cr-search-engines-list engines="[[defaultEngines]]">

16 </cr-search-engines-list>	16 </cr-search-engines-list>

17	17

18 <div class="list-label" i18n-content="searchEnginesOtherLabel"></div>	18 <div class="list-label" i18n-content="searchEnginesOtherLabel"></div>

19 <cr-search-engines-list engines="[[otherEngines]]">	19 <cr-search-engines-list engines="[[otherEngines]]">

20 </cr-search-engines-list>	20 </cr-search-engines-list>

21 </div>	21 </div>

22 </paper-material>	22 </paper-material>

23 </template>	23 </template>

24 <script src="search_engines_page.js"></script>	24 <script src="search_engines_page.js"></script>

25 </dom-module>	25 </dom-module>

OLD	NEW