diff options
7 files changed, 32 insertions, 25 deletions
diff --git a/chrome/browser/chromeos/status/network_menu.cc b/chrome/browser/chromeos/status/network_menu.cc index fad447f..8fbc4bfe 100644 --- a/chrome/browser/chromeos/status/network_menu.cc +++ b/chrome/browser/chromeos/status/network_menu.cc @@ -907,19 +907,17 @@ void MoreMenuModel::InitMenuItems(bool should_open_button_options) { MenuItemVector address_items; NetworkLibrary* cros = CrosLibrary::Get()->GetNetworkLibrary(); - bool oobe = !should_open_button_options; // we don't show options for OOBE. bool connected = cros->Connected(); // always call for test expectations. - if (!oobe) { - int message_id = -1; - if (StatusAreaViewChromeos::IsBrowserMode()) - message_id = IDS_STATUSBAR_NETWORK_OPEN_OPTIONS_DIALOG; - else if (connected) - message_id = IDS_STATUSBAR_NETWORK_OPEN_PROXY_SETTINGS_DIALOG; - if (message_id != -1) { - link_items.push_back(MenuItem(ui::MenuModel::TYPE_COMMAND, - l10n_util::GetStringUTF16(message_id), - SkBitmap(), std::string(), FLAG_OPTIONS)); - } + + int message_id = -1; + if (StatusAreaViewChromeos::IsBrowserMode()) + message_id = IDS_STATUSBAR_NETWORK_OPEN_OPTIONS_DIALOG; + else if (connected) + message_id = IDS_STATUSBAR_NETWORK_OPEN_PROXY_SETTINGS_DIALOG; + if (message_id != -1) { + link_items.push_back(MenuItem(ui::MenuModel::TYPE_COMMAND, + l10n_util::GetStringUTF16(message_id), + SkBitmap(), std::string(), FLAG_OPTIONS)); } if (connected) { diff --git a/chrome/browser/resources/chromeos/login/network_dropdown.js b/chrome/browser/resources/chromeos/login/network_dropdown.js index cb05873..de222c7 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_ = ''; diff --git a/chrome/browser/resources/chromeos/login/oobe_screen_network.js b/chrome/browser/resources/chromeos/login/oobe_screen_network.js index f2ef165..baa3dd1 100644 --- a/chrome/browser/resources/chromeos/login/oobe_screen_network.js +++ b/chrome/browser/resources/chromeos/login/oobe_screen_network.js @@ -46,11 +46,11 @@ cr.define('oobe', function() { }, onBeforeShow: function(data) { - cr.ui.DropDown.setActive('networks-list', true); + cr.ui.DropDown.setActive('networks-list', true, true); }, onBeforeHide: function() { - cr.ui.DropDown.setActive('networks-list', false); + cr.ui.DropDown.setActive('networks-list', false, true); }, /** diff --git a/chrome/browser/resources/chromeos/login/screen_error_message.js b/chrome/browser/resources/chromeos/login/screen_error_message.js index 5565967..8db1204 100644 --- a/chrome/browser/resources/chromeos/login/screen_error_message.js +++ b/chrome/browser/resources/chromeos/login/screen_error_message.js @@ -95,14 +95,14 @@ cr.define('login', function() { }, onBeforeShow: function() { - cr.ui.DropDown.setActive('offline-networks-list', true); + cr.ui.DropDown.setActive('offline-networks-list', true, false); $('error-guest-signin').hidden = $('guestSignin').hidden || !$('add-user-header-bar-item').hidden; }, onBeforeHide: function() { - cr.ui.DropDown.setActive('offline-networks-list', false); + cr.ui.DropDown.setActive('offline-networks-list', false, false); }, update: function() { diff --git a/chrome/browser/ui/webui/chromeos/login/network_dropdown.cc b/chrome/browser/ui/webui/chromeos/login/network_dropdown.cc index 404d4d61..adc9261 100644 --- a/chrome/browser/ui/webui/chromeos/login/network_dropdown.cc +++ b/chrome/browser/ui/webui/chromeos/login/network_dropdown.cc @@ -92,9 +92,11 @@ base::ListValue* NetworkMenuWebUI::ConvertMenuModel(ui::MenuModel* model) { // NetworkDropdown ------------------------------------------------------------- -NetworkDropdown::NetworkDropdown(WebUI* web_ui, gfx::NativeWindow parent_window) +NetworkDropdown::NetworkDropdown(WebUI* web_ui, + gfx::NativeWindow parent_window, bool oobe) : parent_window_(parent_window), - web_ui_(web_ui) { + web_ui_(web_ui), + oobe_(oobe) { network_menu_.reset(new NetworkMenuWebUI(this, web_ui)); network_icon_.reset( new NetworkMenuIcon(this, NetworkMenuIcon::DROPDOWN_MODE)); @@ -128,7 +130,7 @@ void NetworkDropdown::OpenButtonOptions() { } bool NetworkDropdown::ShouldOpenButtonOptions() const { - return false; + return !oobe_; } void NetworkDropdown::OnNetworkManagerChanged(NetworkLibrary* cros) { diff --git a/chrome/browser/ui/webui/chromeos/login/network_dropdown.h b/chrome/browser/ui/webui/chromeos/login/network_dropdown.h index 7fd6f97..73e2d0e 100644 --- a/chrome/browser/ui/webui/chromeos/login/network_dropdown.h +++ b/chrome/browser/ui/webui/chromeos/login/network_dropdown.h @@ -22,7 +22,7 @@ class NetworkDropdown : public NetworkMenu::Delegate, NetworkLibrary::NetworkManagerObserver, public LoginHtmlDialog::Delegate { public: - NetworkDropdown(WebUI* web_ui, gfx::NativeWindow parent_window); + NetworkDropdown(WebUI* web_ui, gfx::NativeWindow parent_window, bool oobe); virtual ~NetworkDropdown(); // This method should be called, when item with the given id is chosen. @@ -63,6 +63,9 @@ class NetworkDropdown : public NetworkMenu::Delegate, WebUI* web_ui_; + // Is the dropdown shown on one of the OOBE screens. + bool oobe_; + DISALLOW_COPY_AND_ASSIGN(NetworkDropdown); }; diff --git a/chrome/browser/ui/webui/chromeos/login/network_dropdown_handler.cc b/chrome/browser/ui/webui/chromeos/login/network_dropdown_handler.cc index 7fc122d..5c46610 100644 --- a/chrome/browser/ui/webui/chromeos/login/network_dropdown_handler.cc +++ b/chrome/browser/ui/webui/chromeos/login/network_dropdown_handler.cc @@ -66,12 +66,15 @@ void NetworkDropdownHandler::HandleNetworkItemChosen( void NetworkDropdownHandler::HandleNetworkDropdownShow( const base::ListValue* args) { - DCHECK(args->GetSize() == 1); + DCHECK(args->GetSize() == 2); std::string element_id; if (!args->GetString(0, &element_id)) NOTREACHED(); + bool oobe; + if (!args->GetBoolean(1, &oobe)) + NOTREACHED(); - dropdown_.reset(new NetworkDropdown(web_ui_, GetNativeWindow())); + dropdown_.reset(new NetworkDropdown(web_ui_, GetNativeWindow(), oobe)); } void NetworkDropdownHandler::HandleNetworkDropdownHide( |