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

Unified Diff: chrome/browser/ui/webui/chromeos/login/network_dropdown_handler.cc

Issue 2067153002: ChromeOS: Implement Network Selection screen of material design OOBE. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Reverted change to web_ui_browser_test.cc that was moved to another CL. Created 4 years, 5 months 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/ui/webui/chromeos/login/network_dropdown_handler.cc
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 bdbf7fcb16d6166942be9fe47ce3b086770ddde7..b8bb9d6e6800824f4c47c7f74ebfaa7c76d5e04b 100644
--- a/chrome/browser/ui/webui/chromeos/login/network_dropdown_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/network_dropdown_handler.cc
@@ -5,9 +5,12 @@
#include "chrome/browser/ui/webui/chromeos/login/network_dropdown_handler.h"
#include "chrome/browser/chromeos/login/ui/webui_login_display.h"
+#include "chrome/browser/chromeos/options/network_config_view.h"
+#include "chrome/browser/chromeos/ui/choose_mobile_network_dialog.h"
#include "chrome/browser/ui/webui/chromeos/login/network_dropdown.h"
#include "chrome/grit/generated_resources.h"
#include "components/login/localized_values_builder.h"
+#include "third_party/cros_system_api/dbus/service_constants.h"
namespace {
@@ -18,6 +21,10 @@ const char kJsApiNetworkItemChosen[] = "networkItemChosen";
const char kJsApiNetworkDropdownShow[] = "networkDropdownShow";
const char kJsApiNetworkDropdownHide[] = "networkDropdownHide";
const char kJsApiNetworkDropdownRefresh[] = "networkDropdownRefresh";
+const char kJsApiLaunchProxySettingsDialog[] = "launchProxySettingsDialog";
+const char kJsApiLaunchAddWiFiNetworkDialog[] = "launchAddWiFiNetworkDialog";
+const char kJsApiLaunchAddMobileNetworkDialog[] =
+ "launchAddMobileNetworkDialog";
} // namespace
@@ -57,6 +64,28 @@ void NetworkDropdownHandler::RegisterMessages() {
&NetworkDropdownHandler::HandleNetworkDropdownHide);
AddCallback(kJsApiNetworkDropdownRefresh,
&NetworkDropdownHandler::HandleNetworkDropdownRefresh);
+
+ // MD-OOBE
+ AddCallback(kJsApiLaunchProxySettingsDialog,
+ &NetworkDropdownHandler::HandleLaunchProxySettingsDialog);
+ AddCallback(kJsApiLaunchAddWiFiNetworkDialog,
+ &NetworkDropdownHandler::HandleLaunchAddWiFiNetworkDialog);
+ AddCallback(kJsApiLaunchAddMobileNetworkDialog,
+ &NetworkDropdownHandler::HandleLaunchAddMobileNetworkDialog);
+}
+
+void NetworkDropdownHandler::HandleLaunchProxySettingsDialog() {
+ dropdown_->OpenButtonOptions();
+}
+
+void NetworkDropdownHandler::HandleLaunchAddWiFiNetworkDialog() {
+ gfx::NativeWindow native_window = GetNativeWindow();
+ NetworkConfigView::ShowForType(shill::kTypeWifi, native_window);
+}
+
+void NetworkDropdownHandler::HandleLaunchAddMobileNetworkDialog() {
+ gfx::NativeWindow native_window = GetNativeWindow();
+ ChooseMobileNetworkDialog::ShowDialog(native_window);
}
void NetworkDropdownHandler::OnConnectToNetworkRequested() {

Powered by Google App Engine
This is Rietveld 408576698