Commit ee256333 authored by Owen Min's avatar Owen Min Committed by Commit Bot

Fix Chrome hang when user login with force-sign-in enabled on Mac

Two functions do not call the assoicated Cocoa suffix properly.
It causes an infinity loop in the end.

Here is the original CL:
https://chromium.googlesource.com/chromium/src/+/007bca68b8905abeac9519c0809d039fc47f73a8

Please note that the CL above has been checked into M66. It was not caught by the QA
team as the code was disabled by the feature switcher.

Bug: 835758
Change-Id: I60f38199049fcf07f1767680f4287349152f1360
Reviewed-on: https://chromium-review.googlesource.com/1025047Reviewed-by: default avatarElly Fong-Jones <ellyjones@chromium.org>
Commit-Queue: Owen Min <zmin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#553092}
parent 8113f139
...@@ -252,7 +252,7 @@ void UserManager::AddOnUserManagerShownCallbackForTesting( ...@@ -252,7 +252,7 @@ void UserManager::AddOnUserManagerShownCallbackForTesting(
base::FilePath UserManager::GetSigninProfilePath() { base::FilePath UserManager::GetSigninProfilePath() {
#if defined(OS_MACOSX) #if defined(OS_MACOSX)
if (views_mode_controller::IsViewsBrowserCocoa()) { if (views_mode_controller::IsViewsBrowserCocoa()) {
return UserManager::GetSigninProfilePath(); return UserManager::GetSigninProfilePathCocoa();
} }
#endif #endif
...@@ -341,7 +341,7 @@ void UserManagerProfileDialog::ShowDialogAndDisplayErrorMessage( ...@@ -341,7 +341,7 @@ void UserManagerProfileDialog::ShowDialogAndDisplayErrorMessage(
void UserManagerProfileDialog::DisplayErrorMessage() { void UserManagerProfileDialog::DisplayErrorMessage() {
#if defined(OS_MACOSX) #if defined(OS_MACOSX)
if (views_mode_controller::IsViewsBrowserCocoa()) { if (views_mode_controller::IsViewsBrowserCocoa()) {
return UserManagerProfileDialog::DisplayErrorMessage(); return UserManagerProfileDialog::DisplayErrorMessageCocoa();
} }
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment