Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2864)

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

Issue 9668010: Move proxy handling into network details. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix 80-column wrap. Created 8 years, 9 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/resources/options2/chromeos/internet_options.js
diff --git a/chrome/browser/resources/options2/chromeos/internet_options.js b/chrome/browser/resources/options2/chromeos/internet_options.js
index 92935755efcdf995cc09d6122f88b3d5f856d275..9718ef2e56b22c92d5832285e54066ce49e168cb 100644
--- a/chrome/browser/resources/options2/chromeos/internet_options.js
+++ b/chrome/browser/resources/options2/chromeos/internet_options.js
@@ -82,9 +82,6 @@ cr.define('options', function() {
if (!servicePath || !servicePath.length ||
!networkType || !networkType.length)
return;
- var networkName = params.networkName;
- if (networkName)
- options.ProxyOptions.getInstance().setNetworkName(networkName);
chrome.send('buttonClickCallback',
[networkType, servicePath, 'options']);
},
@@ -315,6 +312,7 @@ cr.define('options', function() {
// TODO(chocobo): Is this hack to cache the data here reasonable?
$('connectionState').data = data;
+
$('buyplanDetails').hidden = true;
$('activateDetails').hidden = true;
$('viewAccountDetails').hidden = true;
@@ -327,6 +325,7 @@ cr.define('options', function() {
detailsPage.deviceConnected = data.deviceConnected;
detailsPage.connecting = data.connecting;
detailsPage.connected = data.connected;
+ detailsPage.showProxy = data.showProxy;
$('connectionState').textContent = data.connectionState;
var inetAddress = '';
@@ -351,10 +350,6 @@ cr.define('options', function() {
$('ipTypeDHCPDiv').hidden = !data.showStaticIPConfig;
$('ipTypeStaticDiv').hidden = !data.showStaticIPConfig;
- // 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');
options.internet.IPConfigList.decorate(ipConfigList);
ipConfigList.disabled =
@@ -582,6 +577,8 @@ cr.define('options', function() {
}
}
+ detailsPage.updateControls();
+
// Don't show page name in address bar and in history to prevent people
// navigate here by hand and solve issue with page session restore.
OptionsPage.showPageByName('detailsInternetPage', false);
« no previous file with comments | « chrome/browser/resources/options2/chromeos/internet_detail.js ('k') | chrome/browser/resources/options2/options.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698