| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/ui/webui/chromeos/login/network_dropdown_handler.h" | 5 #include "chrome/browser/ui/webui/chromeos/login/network_dropdown_handler.h" |
| 6 | 6 |
| 7 #include "chrome/browser/chromeos/login/ui/webui_login_display.h" | 7 #include "chrome/browser/chromeos/login/ui/webui_login_display.h" |
| 8 #include "chrome/browser/chromeos/options/network_config_view.h" | 8 #include "chrome/browser/chromeos/options/network_config_view.h" |
| 9 #include "chrome/browser/chromeos/ui/choose_mobile_network_dialog.h" | 9 #include "chrome/browser/chromeos/ui/choose_mobile_network_dialog.h" |
| 10 #include "chrome/browser/ui/webui/chromeos/login/network_dropdown.h" | 10 #include "chrome/browser/ui/webui/chromeos/login/network_dropdown.h" |
| 11 #include "chrome/grit/generated_resources.h" | 11 #include "chrome/grit/generated_resources.h" |
| 12 #include "components/login/localized_values_builder.h" | 12 #include "components/login/localized_values_builder.h" |
| 13 #include "third_party/cros_system_api/dbus/service_constants.h" | 13 #include "third_party/cros_system_api/dbus/service_constants.h" |
| 14 #include "ui/views/widget/widget_parent.h" |
| 14 | 15 |
| 15 namespace { | 16 namespace { |
| 16 | 17 |
| 17 const char kJsScreenPath[] = "cr.ui.DropDown"; | 18 const char kJsScreenPath[] = "cr.ui.DropDown"; |
| 18 | 19 |
| 19 // JS API callbacks names. | 20 // JS API callbacks names. |
| 20 const char kJsApiNetworkItemChosen[] = "networkItemChosen"; | 21 const char kJsApiNetworkItemChosen[] = "networkItemChosen"; |
| 21 const char kJsApiNetworkDropdownShow[] = "networkDropdownShow"; | 22 const char kJsApiNetworkDropdownShow[] = "networkDropdownShow"; |
| 22 const char kJsApiNetworkDropdownHide[] = "networkDropdownHide"; | 23 const char kJsApiNetworkDropdownHide[] = "networkDropdownHide"; |
| 23 const char kJsApiNetworkDropdownRefresh[] = "networkDropdownRefresh"; | 24 const char kJsApiNetworkDropdownRefresh[] = "networkDropdownRefresh"; |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 72 &NetworkDropdownHandler::HandleLaunchAddWiFiNetworkDialog); | 73 &NetworkDropdownHandler::HandleLaunchAddWiFiNetworkDialog); |
| 73 AddCallback(kJsApiLaunchAddMobileNetworkDialog, | 74 AddCallback(kJsApiLaunchAddMobileNetworkDialog, |
| 74 &NetworkDropdownHandler::HandleLaunchAddMobileNetworkDialog); | 75 &NetworkDropdownHandler::HandleLaunchAddMobileNetworkDialog); |
| 75 } | 76 } |
| 76 | 77 |
| 77 void NetworkDropdownHandler::HandleLaunchProxySettingsDialog() { | 78 void NetworkDropdownHandler::HandleLaunchProxySettingsDialog() { |
| 78 dropdown_->OpenButtonOptions(); | 79 dropdown_->OpenButtonOptions(); |
| 79 } | 80 } |
| 80 | 81 |
| 81 void NetworkDropdownHandler::HandleLaunchAddWiFiNetworkDialog() { | 82 void NetworkDropdownHandler::HandleLaunchAddWiFiNetworkDialog() { |
| 82 gfx::NativeWindow native_window = GetNativeWindow(); | 83 views::WidgetParent widget_parent; |
| 83 NetworkConfigView::ShowForType(shill::kTypeWifi, native_window); | 84 widget_parent.native_parent = GetNativeWindow(); |
| 85 NetworkConfigView::ShowForType(shill::kTypeWifi, widget_parent); |
| 84 } | 86 } |
| 85 | 87 |
| 86 void NetworkDropdownHandler::HandleLaunchAddMobileNetworkDialog() { | 88 void NetworkDropdownHandler::HandleLaunchAddMobileNetworkDialog() { |
| 87 gfx::NativeWindow native_window = GetNativeWindow(); | 89 gfx::NativeWindow native_window = GetNativeWindow(); |
| 88 ChooseMobileNetworkDialog::ShowDialog(native_window); | 90 ChooseMobileNetworkDialog::ShowDialog(native_window); |
| 89 } | 91 } |
| 90 | 92 |
| 91 void NetworkDropdownHandler::OnConnectToNetworkRequested() { | 93 void NetworkDropdownHandler::OnConnectToNetworkRequested() { |
| 92 for (Observer& observer : observers_) | 94 for (Observer& observer : observers_) |
| 93 observer.OnConnectToNetworkRequested(); | 95 observer.OnConnectToNetworkRequested(); |
| (...skipping 20 matching lines...) Expand all Loading... |
| 114 } | 116 } |
| 115 | 117 |
| 116 void NetworkDropdownHandler::HandleNetworkDropdownRefresh() { | 118 void NetworkDropdownHandler::HandleNetworkDropdownRefresh() { |
| 117 // Since language change is async, | 119 // Since language change is async, |
| 118 // we may in theory be on another screen during this call. | 120 // we may in theory be on another screen during this call. |
| 119 if (dropdown_.get()) | 121 if (dropdown_.get()) |
| 120 dropdown_->Refresh(); | 122 dropdown_->Refresh(); |
| 121 } | 123 } |
| 122 | 124 |
| 123 } // namespace chromeos | 125 } // namespace chromeos |
| OLD | NEW |