chrome/browser/resources/settings/internet_page/network_proxy.html - Issue 1346823005: Elim cr_button from md-settings

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/internet_page/network_proxy.html

Issue 1346823005: Elim cr_button from md-settings (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 3 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

« chrome/browser/resources/settings/downloads_page/downloads_page.html ('K') | « chrome/browser/resources/settings/internet_page/network_apnlist.html ('k') | chrome/browser/resources/settings/internet_page/network_siminfo.html » ('j') | chrome/browser/resources/settings/search_page/search_page.css » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 <link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.html">	1 <link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.html">

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

2 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-ch eckbox.html">	3 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-ch eckbox.html">

3 <link rel="import" href="chrome://resources/polymer/v1_0/paper-styles/paper-styl es.html">	4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-styles/paper-styl es.html">

4 <link rel="import" href="chrome://resources/cr_elements/v1_0/cr_input/cr_input.h tml">	5 <link rel="import" href="chrome://resources/cr_elements/v1_0/cr_input/cr_input.h tml">

5 <link rel="import" href="chrome://resources/cr_elements/v1_0/network/cr_onc_type s.html">	6 <link rel="import" href="chrome://resources/cr_elements/v1_0/network/cr_onc_type s.html">

6 <link rel="import" href="network_property_list.html">	7 <link rel="import" href="network_property_list.html">

7 <link rel="import" href="network_proxy_input.html">	8 <link rel="import" href="network_proxy_input.html">

8 <link rel="import" href="network_proxy_exclusions.html">	9 <link rel="import" href="network_proxy_exclusions.html">

9	10

10 <dom-module id="network-proxy">	11 <dom-module id="network-proxy">

11 <link rel="import" type="css" href="network_proxy.css">	12 <link rel="import" type="css" href="network_proxy.css">

(...skipping 51 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
63 </network-proxy-input>	64 </network-proxy-input>

64 </div>	65 </div>

65	66

66 <span>Do not use the proxy settings for these hosts and domains:</span>	67 <span>Do not use the proxy settings for these hosts and domains:</span>

67 <network-proxy-exclusions exclusions="{{proxy.ExcludeDomains}}"	68 <network-proxy-exclusions exclusions="{{proxy.ExcludeDomains}}"

68 on-proxy-change="onProxyExclusionsChange_">	69 on-proxy-change="onProxyExclusionsChange_">

69 </network-proxy-exclusions>	70 </network-proxy-exclusions>

70 <div class="layout horizontal baseline">	71 <div class="layout horizontal baseline">

71 <cr-input id="proxyExclusion" class="flex" no-label-float>	72 <cr-input id="proxyExclusion" class="flex" no-label-float>

72 </cr-input>	73 </cr-input>

73 <cr-button on-click="onAddProxyExclusion_">	74 <paper-button on-tap="onAddProxyExclusion_">

74 Add Exception	75 Add Exception

75 </cr-button>	76 </paper-button>

76 </div>	77 </div>

77 </div>	78 </div>

78 </div>	79 </div>

79 </template>	80 </template>

80 <script src="network_proxy.js"></script>	81 <script src="network_proxy.js"></script>

81 </dom-module>	82 </dom-module>

OLD	NEW