chrome/browser/resources/settings/settings_main/settings_main.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/settings_main/settings_main.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/settings_drawer/settings_drawer.html ('k') | chrome/browser/resources/settings/settings_menu/settings_menu.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/iron-pages/iron-pages.h tml">	2 <link rel="import" href="chrome://resources/polymer/v1_0/iron-pages/iron-pages.h tml">

3 <link rel="import" href="chrome://md-settings/routes.html">	3 <link rel="import" href="chrome://md-settings/routes.html">

4 <link rel="import" href="chrome://md-settings/settings_page/settings_page_header .html">	4 <link rel="import" href="chrome://md-settings/settings_page/settings_page_header .html">

5 <link rel="import" href="chrome://md-settings/a11y_page/a11y_page.html">	5 <link rel="import" href="chrome://md-settings/a11y_page/a11y_page.html">

6 <link rel="import" href="chrome://md-settings/date_time_page/date_time_page.html ">	6 <link rel="import" href="chrome://md-settings/date_time_page/date_time_page.html ">

7 <link rel="import" href="chrome://md-settings/downloads_page/downloads_page.html ">	7 <link rel="import" href="chrome://md-settings/downloads_page/downloads_page.html ">

8 <link rel="import" href="chrome://md-settings/search_engines_page/search_engines _page.html">	8 <link rel="import" href="chrome://md-settings/search_engines_page/search_engines _page.html">

9 <link rel="import" href="chrome://md-settings/search_page/search_page.html">	9 <link rel="import" href="chrome://md-settings/search_page/search_page.html">

10	10

11 <!-- TODO: Uncomment pages as they are upgraded.	11 <!-- TODO: Uncomment pages as they are upgraded.

12 <link rel="import" href="chrome://md-settings/internet_page/internet_page.html">	12 <link rel="import" href="chrome://md-settings/internet_page/internet_page.html">

(...skipping 32 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
45 </cr-settings-downloads-page>	45 </cr-settings-downloads-page>

46 <cr-settings-search-page route="search"></cr-settings-search-page>	46 <cr-settings-search-page route="search"></cr-settings-search-page>

47 <cr-settings-search-engines-page route="search-engines">	47 <cr-settings-search-engines-page route="search-engines">

48 </cr-settings-search-engines-page>	48 </cr-settings-search-engines-page>

49 </iron-pages>	49 </iron-pages>

50 </more-route-selector>	50 </more-route-selector>

51 </div>	51 </div>

52 </template>	52 </template>

53 <script src="settings_main.js"></script>	53 <script src="settings_main.js"></script>

54 </polymer-element>	54 </polymer-element>

OLD	NEW