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

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

Issue 8633012: [cros] Return proxy-settings back to the network menu list for OOBE. (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 cb058731f94f89d0020d0b26f842ad8df161f2bd..de222c735f8f12baee6087a2bcfc886f216ca877 100644
--- a/chrome/browser/resources/chromeos/login/network_dropdown.js
+++ b/chrome/browser/resources/chromeos/login/network_dropdown.js
@@ -373,13 +373,14 @@ cr.define('cr.ui', function() {
* 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} is_active Is drop-down active?
+ * @param {boolean} isActive Is drop-down active?
+ * @param {boolean} isOobe Is dropdown placed on an OOBE screen.
*/
- DropDown.setActive = function(elementId, isActive) {
+ DropDown.setActive = function(elementId, isActive, isOobe) {
if (isActive) {
DropDown.activeElementId_ = elementId;
$(elementId).isShown = false;
- chrome.send('networkDropdownShow', [elementId]);
+ chrome.send('networkDropdownShow', [elementId, isOobe]);
} else {
if (DropDown.activeElementId_ == elementId) {
DropDown.activeElementId_ = '';
« no previous file with comments | « chrome/browser/chromeos/status/network_menu.cc ('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