chrome/browser/resources/options/chromeos/internet_options.js - Issue 8102019: redesign and reimplement proxy config service and tracker, revise proxy ui on cros

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

Unified Diff: chrome/browser/resources/options/chromeos/internet_options.js

Issue 8102019: redesign and reimplement proxy config service and tracker, revise proxy ui on cros (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: '' Created 9 years, 1 month 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 side-by-side diff with in-line comments

Download patch

« chrome/browser/chromeos/proxy_config_service_impl.cc ('K') | « chrome/browser/resources/options/chromeos/internet_detail.html ('k') | chrome/browser/resources/options/chromeos/proxy.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/resources/options/chromeos/internet_options.js

===================================================================

--- chrome/browser/resources/options/chromeos/internet_options.js (revision 108608)

+++ chrome/browser/resources/options/chromeos/internet_options.js (working copy)

@@ -455,20 +455,9 @@

$('ipTypeDHCPDiv').hidden = !data.showStaticIPConfig;

$('ipTypeStaticDiv').hidden = !data.showStaticIPConfig;

- // Hide change-proxy-button if proxy is not configurable.

- $('change-proxy-button').hidden = !data.proxyConfigurable;

- // If necessary, set text for change-proxy-text and show it.

- var changeProxyText = $('change-proxy-text');

- if (data.changeProxyText != '') {

- changeProxyText.textContent =

- localStrings.getString(data.changeProxyText);

- changeProxyText.hidden = false;

- } else {

- changeProxyText.hidden = true;

- }

- // Hide change-proxy-section if button and text are hidden.

- $('change-proxy-section').hidden = !data.proxyConfigurable &&

- changeProxyText.hidden;

+ // Hide change-proxy-button and change-proxy-section if not showing proxy.

+ $('change-proxy-button').hidden = !data.showProxy;

+ $('change-proxy-section').hidden = !data.showProxy;

var ipConfigList = $('ipConfigList');

ipConfigList.disabled = $('ipTypeDHCP').checked || !data.showStaticIPConfig;