chrome/browser/resources/options/browser_options.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/options/browser_options.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/media_router/elements/route_details/route_details.html ('k') | chrome/browser/resources/options/compiled_resources.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 <div id="settings" class="page" hidden>	1 <div id="settings" class="page" hidden>

2 <header>	2 <header>

3 <h1 i18n-content="settingsTitle"></h1>	3 <h1 i18n-content="settingsTitle"></h1>

4 </header>	4 </header>

5 <include src="reset_profile_settings_banner.html">	5 <include src="reset_profile_settings_banner.html">

6 <include src="automatic_settings_reset_banner.html">	6 <include src="automatic_settings_reset_banner.html">

7 <if expr="chromeos">	7 <if expr="chromeos">

8 <link rel="import" href="chrome://resources/cr_elements/v0_8/cr_network_icon/c r_network_icon.html">	8 <link rel="import" href="chrome://resources/cr_elements/v1_0/cr_network_icon/c r_network_icon.html">

9 <link rel="import" href="chrome://resources/cr_elements/v0_8/cr_onc/cr_onc_dat a.html">	9 <link rel="import" href="chrome://resources/cr_elements/v1_0/cr_onc/cr_onc_dat a.html">

10 <include src="secondary_user_banner.html">	10 <include src="secondary_user_banner.html">

11 <section>	11 <section>

12 <div id="network-section-header" class="section-header">	12 <div id="network-section-header" class="section-header">

13 <h3 i18n-content="sectionTitleInternet"></h3>	13 <h3 i18n-content="sectionTitleInternet"></h3>

14 <span class="controlled-setting-indicator" plural></span>	14 <span class="controlled-setting-indicator" plural></span>

15 </div>	15 </div>

16 <div id="network-settings">	16 <div id="network-settings">

17 <list id="network-list"></list>	17 <list id="network-list"></list>

18 <div id="shared-proxies" class="checkbox">	18 <div id="shared-proxies" class="checkbox">

19 <label>	19 <label>

(...skipping 1003 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1023 </button>	1023 </button>

1024 </div>	1024 </div>

1025 </section>	1025 </section>

1026 </div> <!-- advanced-settings-container -->	1026 </div> <!-- advanced-settings-container -->

1027 </div> <!-- advanced-settings -->	1027 </div> <!-- advanced-settings -->

1028 <footer id="advanced-settings-footer">	1028 <footer id="advanced-settings-footer">

1029 <a is="action-link" id="advanced-settings-expander"	1029 <a is="action-link" id="advanced-settings-expander"

1030 i18n-content="showAdvancedSettings"></a>	1030 i18n-content="showAdvancedSettings"></a>

1031 </footer>	1031 </footer>

1032 </div>	1032 </div>

OLD	NEW