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

Unified Diff: chrome/browser/resources/chromeos/login/network_dropdown.js

Issue 8681029: [cros] Make disconnected icons used by network drop-down and network button consistent. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merged 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
Index: chrome/browser/resources/chromeos/login/network_dropdown.js
diff --git a/chrome/browser/resources/chromeos/login/network_dropdown.js b/chrome/browser/resources/chromeos/login/network_dropdown.js
index 4a07368cf92e9b984f1e3e6383f44893496303e6..6d89280b5bf441e815830fe7fd876a4c03d052b1 100644
--- a/chrome/browser/resources/chromeos/login/network_dropdown.js
+++ b/chrome/browser/resources/chromeos/login/network_dropdown.js
@@ -369,25 +369,31 @@ cr.define('cr.ui', function() {
};
/**
- * Activates or deactivates network drop-down. Only one network drop-down
+ * Activates network drop-down. Only one network drop-down
* can be active at the same time. So activating new drop-down deactivates
- * the previous one. Deactivating not active drop-down does nothing.
- * @param {string} element_id Id of the element which is network drop-down.
- * @param {boolean} isActive Is drop-down active?
- * @param {boolean} isOobe Is dropdown placed on an OOBE screen.
+ * the previous one.
+ * @param {string} elementId Id of network drop-down element.
+ * @param {boolean} isOobe Whether drop-down is used by an Oobe screen.
+ * @param {integer} lastNetworkType Last active network type. Pass -1 if it
+ * isn't known.
*/
- DropDown.setActive = function(elementId, isActive, isOobe) {
- if (isActive) {
- $(elementId).isShown = false;
- if (DropDown.activeElementId_ != elementId) {
- DropDown.activeElementId_ = elementId;
- chrome.send('networkDropdownShow', [elementId, isOobe]);
- }
- } else {
- if (DropDown.activeElementId_ == elementId) {
- DropDown.activeElementId_ = '';
- chrome.send('networkDropdownHide', []);
- }
+ DropDown.show = function(elementId, isOobe, lastNetworkType) {
+ $(elementId).isShown = false;
+ if (DropDown.activeElementId_ != elementId) {
+ DropDown.activeElementId_ = elementId;
+ chrome.send('networkDropdownShow', [elementId, isOobe, lastNetworkType]);
+ }
+ };
+
+ /**
+ * Deactivates network drop-down. Deactivating inactive drop-down does
+ * nothing.
+ * @param {string} elementId Id of network drop-down element.
+ */
+ DropDown.hide = function(elementId) {
+ if (DropDown.activeElementId_ == elementId) {
+ DropDown.activeElementId_ = '';
+ chrome.send('networkDropdownHide', []);
}
};
« no previous file with comments | « chrome/browser/resources/chromeos/login/header_bar.js ('k') | chrome/browser/resources/chromeos/login/oobe_screen_network.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698