BASELINE: Update Chromium to 90.0.4430.221

Change-Id: Iff4d9d18d2fcf1a576f3b1f453010f744a232920
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

1 files changed, 62 insertions, 18 deletions

diff --git a/chromium/chrome/browser/ui/webui/chromeos/login/error_screen_handler.cc b/chromium/chrome/browser/ui/webui/chromeos/login/error_screen_handler.cc
index e25304e547a..2afa803be73 100644
--- a/chromium/chrome/browser/ui/webui/chromeos/login/error_screen_handler.cc
+++ b/chromium/chrome/browser/ui/webui/chromeos/login/error_screen_handler.cc
@@ -5,7 +5,7 @@
 #include "chrome/browser/ui/webui/chromeos/login/error_screen_handler.h"
 
 #include "base/time/time.h"
-#include "chrome/browser/chromeos/login/screens/error_screen.h"
+#include "chrome/browser/ash/login/screens/error_screen.h"
 #include "chrome/browser/ui/webui/chromeos/network_element_localized_strings_provider.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
@@ -61,38 +61,87 @@ void ErrorScreenHandler::ShowOobeScreen(OobeScreenId screen) {
 
 void ErrorScreenHandler::SetErrorStateCode(
     NetworkError::ErrorState error_state) {
-  CallJS("login.ErrorMessageScreen.setErrorState",
-         static_cast<int>(error_state));
+  // TODO(crbug.com/1180291) - Remove once OOBE JS calls are fixed.
+  if (IsSafeToCallJavascript()) {
+    CallJS("login.ErrorMessageScreen.setErrorState",
+           static_cast<int>(error_state));
+  } else {
+    LOG(ERROR) << "Silently dropping SetErrorStateNetwork request.";
+  }
 }
 
 void ErrorScreenHandler::SetErrorStateNetwork(const std::string& network_name) {
-  CallJS("login.ErrorMessageScreen.setErrorStateNetwork", network_name);
+  // TODO(crbug.com/1180291) - Remove once OOBE JS calls are fixed.
+  if (IsSafeToCallJavascript()) {
+    CallJS("login.ErrorMessageScreen.setErrorStateNetwork", network_name);
+  } else {
+    LOG(ERROR) << "Silently dropping SetErrorStateNetwork request.";
+  }
 }
 
 void ErrorScreenHandler::SetGuestSigninAllowed(bool value) {
-  CallJS("login.ErrorMessageScreen.allowGuestSignin", value);
+  // TODO(crbug.com/1180291) - Remove once OOBE JS calls are fixed.
+  if (IsSafeToCallJavascript()) {
+    CallJS("login.ErrorMessageScreen.allowGuestSignin", value);
+  } else {
+    LOG(ERROR) << "Silently dropping SetGuestSigninAllowed request.";
+  }
 }
 
 void ErrorScreenHandler::SetOfflineSigninAllowed(bool value) {
-  CallJS("login.ErrorMessageScreen.allowOfflineLogin", value);
+  // TODO(crbug.com/1180291) - Remove once OOBE JS calls are fixed.
+  if (IsSafeToCallJavascript()) {
+    CallJS("login.ErrorMessageScreen.allowOfflineLogin", value);
+  } else {
+    LOG(ERROR) << "Silently dropping SetOfflineSigninAllowed request.";
+  }
 }
 
 void ErrorScreenHandler::SetShowConnectingIndicator(bool value) {
-  CallJS("login.ErrorMessageScreen.showConnectingIndicator", value);
+  // TODO(crbug.com/1180291) - Remove once OOBE JS calls are fixed.
+  if (IsSafeToCallJavascript()) {
+    CallJS("login.ErrorMessageScreen.showConnectingIndicator", value);
+  } else {
+    LOG(ERROR) << "Silently dropping SetShowConnectingIndicator request.";
+  }
 }
 
 void ErrorScreenHandler::SetIsPersistentError(bool is_persistent) {
-  CallJS("login.ErrorMessageScreen.setIsPersistentError", is_persistent);
+  // TODO(crbug.com/1180291) - Remove once OOBE JS calls are fixed.
+  if (IsSafeToCallJavascript()) {
+    CallJS("login.ErrorMessageScreen.setIsPersistentError", is_persistent);
+  } else {
+    LOG(ERROR) << "Silently dropping SetIsPersistentError request.";
+  }
 }
 
 void ErrorScreenHandler::SetUIState(NetworkError::UIState ui_state) {
-  CallJS("login.ErrorMessageScreen.setUIState", static_cast<int>(ui_state));
+  // TODO(crbug.com/1180291) - Remove once OOBE JS calls are fixed
+  if (IsSafeToCallJavascript()) {
+    CallJS("login.ErrorMessageScreen.setUIState", static_cast<int>(ui_state));
+  } else {
+    LOG(ERROR) << "Silently dropping SetUIState request.";
+  }
 }
 
-void ErrorScreenHandler::RegisterMessages() {
-  AddCallback("hideCaptivePortal",
-              &ErrorScreenHandler::HandleHideCaptivePortal);
-  BaseScreenHandler::RegisterMessages();
+// TODO (crbug.com/1168114): We need to handle that fully in C++ once
+// all error screen logic is migrated to Screen object.
+void ErrorScreenHandler::OnCancelButtonClicked() {
+  // TODO(crbug.com/1180291) - Remove once OOBE JS calls are fixed.
+  if (IsSafeToCallJavascript()) {
+    CallJS("cr.ui.Oobe.showUserPods");
+  } else {
+    LOG(ERROR) << "Silently dropping OnCancelButtonClicked request.";
+  }
+}
+
+void ErrorScreenHandler::OnReloadGaiaClicked() {
+  // TODO(crbug.com/1180291) - Remove once OOBE JS calls are fixed.
+  if (IsSafeToCallJavascript()) {
+    CallJS("login.GaiaSigninScreen.doReload");
+  } else {
+    LOG(ERROR) << "Silently dropping OnReloadGaiaClicked request.";
+  }
 }
 
 void ErrorScreenHandler::DeclareLocalizedValues(
@@ -149,9 +198,4 @@ void ErrorScreenHandler::Initialize() {
   }
 }
 
-void ErrorScreenHandler::HandleHideCaptivePortal() {
-  if (screen_)
-    screen_->HideCaptivePortal();
-}
-
 }  // namespace chromeos