| Index: ash/common/system/chromeos/network/network_state_list_detailed_view.cc
|
| diff --git a/ash/common/system/chromeos/network/network_state_list_detailed_view.cc b/ash/common/system/chromeos/network/network_state_list_detailed_view.cc
|
| index 207c5ec6f41689f5a270bed8b74fa6d723c26ef8..bb10f282ebf7f6907aa735e6e4729fd4c72a2938 100644
|
| --- a/ash/common/system/chromeos/network/network_state_list_detailed_view.cc
|
| +++ b/ash/common/system/chromeos/network/network_state_list_detailed_view.cc
|
| @@ -382,7 +382,7 @@ void NetworkStateListDetailedView::HandleButtonPressed(views::Button* sender,
|
|
|
| // If the info bubble was visible, close it when some other item is clicked.
|
| ResetInfoBubble();
|
| -
|
| + bool close_bubble = false;
|
| NetworkStateHandler* handler = NetworkHandler::Get()->network_state_handler();
|
| SystemTrayDelegate* delegate = WmShell::Get()->system_tray_delegate();
|
| if (sender == button_wifi_) {
|
| @@ -396,17 +396,23 @@ void NetworkStateListDetailedView::HandleButtonPressed(views::Button* sender,
|
| ToggleMobile();
|
| } else if (sender == settings_) {
|
| ShowSettings();
|
| + close_bubble = true;
|
| } else if (sender == proxy_settings_) {
|
| delegate->ChangeProxySettings();
|
| + close_bubble = true;
|
| } else if (sender == other_mobile_) {
|
| delegate->ShowOtherNetworkDialog(shill::kTypeCellular);
|
| + close_bubble = true;
|
| } else if (sender == other_wifi_) {
|
| WmShell::Get()->RecordUserMetricsAction(
|
| UMA_STATUS_AREA_NETWORK_JOIN_OTHER_CLICKED);
|
| delegate->ShowOtherNetworkDialog(shill::kTypeWifi);
|
| + close_bubble = true;
|
| } else {
|
| NOTREACHED();
|
| }
|
| + if (close_bubble && owner()->system_tray())
|
| + owner()->system_tray()->CloseSystemBubble();
|
| }
|
|
|
| void NetworkStateListDetailedView::HandleViewClicked(views::View* view) {
|
| @@ -437,6 +443,7 @@ void NetworkStateListDetailedView::HandleViewClicked(views::View* view) {
|
| : UMA_STATUS_AREA_CONNECT_TO_CONFIGURED_NETWORK);
|
| ui::NetworkConnect::Get()->ConnectToNetwork(service_path);
|
| }
|
| + owner()->system_tray()->CloseSystemBubble();
|
| }
|
|
|
| void NetworkStateListDetailedView::CreateExtraTitleRowButtons() {
|
|
|