projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upstream version 9.38.198.0
[platform/framework/web/crosswalk.git]
/
src
/
chrome
/
browser
/
resources
/
options
/
chromeos
/
preferred_networks.js
diff --git
a/src/chrome/browser/resources/options/chromeos/preferred_networks.js
b/src/chrome/browser/resources/options/chromeos/preferred_networks.js
index
b6b461b
..
02bc709
100644
(file)
--- a/
src/chrome/browser/resources/options/chromeos/preferred_networks.js
+++ b/
src/chrome/browser/resources/options/chromeos/preferred_networks.js
@@
-4,7
+4,8
@@
cr.define('options', function() {
cr.define('options', function() {
- var OptionsPage = options.OptionsPage;
+ var Page = cr.ui.pageManager.Page;
+ var PageManager = cr.ui.pageManager.PageManager;
var ArrayDataModel = cr.ui.ArrayDataModel;
var DeletableItem = options.DeletableItem;
var DeletableItemList = options.DeletableItemList;
var ArrayDataModel = cr.ui.ArrayDataModel;
var DeletableItem = options.DeletableItem;
var DeletableItemList = options.DeletableItemList;
@@
-17,25
+18,20
@@
cr.define('options', function() {
* @constructor
*/
function PreferredNetworks(model) {
* @constructor
*/
function PreferredNetworks(model) {
- OptionsPage.call(this,
- 'preferredNetworksPage',
- null,
- 'preferredNetworksPage');
+ Page.call(this, 'preferredNetworksPage', null, 'preferredNetworksPage');
}
cr.addSingletonGetter(PreferredNetworks);
PreferredNetworks.prototype = {
}
cr.addSingletonGetter(PreferredNetworks);
PreferredNetworks.prototype = {
- __proto__:
Options
Page.prototype,
+ __proto__: Page.prototype,
- /**
- * Initializes the preferred networks page.
- */
+ /** @override */
initializePage: function() {
initializePage: function() {
-
Options
Page.prototype.initializePage.call(this);
+ Page.prototype.initializePage.call(this);
PreferredNetworkList.decorate($('remembered-network-list'));
$('preferred-networks-confirm').onclick =
PreferredNetworkList.decorate($('remembered-network-list'));
$('preferred-networks-confirm').onclick =
-
OptionsPage.closeOverlay.bind(OptionsPage
);
+
PageManager.closeOverlay.bind(PageManager
);
},
update: function(rememberedNetworks) {
},
update: function(rememberedNetworks) {
@@
-51,10
+47,8
@@
cr.define('options', function() {
/**
* Creates a list entry for a remembered network.
/**
* Creates a list entry for a remembered network.
- * @param{{networkName: string,
- networkType: string,
- servicePath: string}} data
- * Description of the network.
+ * @param {{Name: string, Type: string, servicePath: string}} data
+ * Description of the network.
* @constructor
*/
function PreferredNetworkListItem(data) {
* @constructor
*/
function PreferredNetworkListItem(data) {
@@
-72,9
+66,7
@@
cr.define('options', function() {
/**
* Description of the network.
/**
* Description of the network.
- * @type {{networkName: string,
- * networkType: string,
- * servicePath: string}}
+ * @type {{Name: string, Type: string, servicePath: string}}
*/
data: null,
*/
data: null,
@@
-82,7
+74,7
@@
cr.define('options', function() {
decorate: function() {
DeletableItem.prototype.decorate.call(this);
var label = this.ownerDocument.createElement('div');
decorate: function() {
DeletableItem.prototype.decorate.call(this);
var label = this.ownerDocument.createElement('div');
- label.textContent = this.data.
network
Name;
+ label.textContent = this.data.Name;
if (this.data.policyManaged)
this.deletable = false;
this.contentElement.appendChild(label);
if (this.data.policyManaged)
this.deletable = false;
this.contentElement.appendChild(label);
@@
-125,7
+117,7
@@
cr.define('options', function() {
if (item) {
// Inform the network library that we are forgetting this network.
chrome.send('networkCommand',
if (item) {
// Inform the network library that we are forgetting this network.
chrome.send('networkCommand',
- [item.
network
Type,
+ [item.Type,
item.servicePath,
'forget']);
}
item.servicePath,
'forget']);
}
@@
-146,9
+138,7
@@
cr.define('options', function() {
/**
* Adds a remembered network to the list.
/**
* Adds a remembered network to the list.
- * @param {{networkName: string,
- networkType: string,
- servicePath: string} data
+ * @param {{Name: string, Type: string, servicePath: string}} data
* Description of the network.
*/
append: function(data) {
* Description of the network.
*/
append: function(data) {