Commit 3a637176 authored by Josiah K's avatar Josiah K Committed by Commit Bot

Chrome OS: Fix crash when removing mangification handler

Bug: 1138781
Change-Id: Ibf8c9594777db2b6f0fd813ac9320962acf62734
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2535643Reviewed-by: default avatarXiyuan Xia <xiyuan@chromium.org>
Commit-Queue: Josiah Krutz <josiahk@google.com>
Cr-Commit-Position: refs/heads/master@{#827134}
parent 84a7201d
...@@ -1134,7 +1134,8 @@ void ChromeBrowserMainPartsChromeos::PostMainMessageLoopRun() { ...@@ -1134,7 +1134,8 @@ void ChromeBrowserMainPartsChromeos::PostMainMessageLoopRun() {
assistant_state_client_.reset(); assistant_state_client_.reset();
ash::Shell::Get()->RemovePreTargetHandler(MagnificationManager::Get()); if (pre_profile_init_called_)
ash::Shell::Get()->RemovePreTargetHandler(MagnificationManager::Get());
// Unregister CrosSettings observers before CrosSettings is destroyed. // Unregister CrosSettings observers before CrosSettings is destroyed.
shutdown_policy_forwarder_.reset(); shutdown_policy_forwarder_.reset();
......
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