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

Issue 2619943002: Revert "chromeos: Fix shelf appearing at login screen under mash" (Closed)

Created:
3 years, 11 months ago by James Cook
Modified:
3 years, 11 months ago
Reviewers:
msw, xiyuan
CC:
chromium-reviews, alemate+watch_chromium.org, sadrul, tfarina, achuith+watch_chromium.org, pam+watch_chromium.org, oshima+watch_chromium.org, kalyank, davemoore+watch_chromium.org
Target Ref:
refs/pending/heads/master
Project:
chromium
Visibility:
Public.

Description

Revert "chromeos: Fix shelf appearing at login screen under mash" That CL causes browser crashes on login when the browser is restoring a minimized window as part of session restore. The crashes occur because the shelf view is created asynchronously in response to a mojo message, but the window restore is synchronous at startup. I will investigate more and reland. Original CL description: Previously chrome --mash would always create the shelf on startup, even at the login screen. Now it waits until login is complete, like classic ash. Ash watches for SessionState::ACTIVE via a SessionStateObserver to create the shelf, rather than NOTIFICATION_LOGIN_USER_PROFILE_PREPARED. For most login flows this doesn't matter, but for supervised user creation it means that the shelf is not created until the flow is completed. This is an improvement because in the old code the shelf would be created too early and had to be explicitly hidden. Always create a SessionControllerClient in chrome, even in classic ash. This allows classic ash to use the mojo pathway via ash::SessionController. Remove WmShell::ShowShelf(), which was introduced in crrev.com/10693003 to delay showing the shelf until post-login OOBE (like avatar picture select) was complete. It does not seem to be needed anymore, either in production or in tests. Change AshTestImplMus to simulate a user logging in which is required to create the shelf on the primary display and also to have a non-zero user count to create the shelf on additional displays. Remove some unnecessary OS_CHROMEOS ifdefs in //c/b/ui/ash. BUG=666021, 679513 TEST=ash_unittests and chrome browser_tests Committed: https://crrev.com/7f99e933e595824281102ff6737075dccbbc4d5c Cr-Commit-Position: refs/heads/master@{#439845} TBR=msw@chromium.org,xiyuan@chromium.org for revert Review-Url: https://codereview.chromium.org/2619943002 Cr-Commit-Position: refs/heads/master@{#442484} Committed: https://chromium.googlesource.com/chromium/src/+/e8604fbd50fd6e6b3e69f51fd79473df92276f96

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+84 lines, -124 lines) Patch
M ash/aura/wm_shell_aura.h View 1 chunk +0 lines, -3 lines 0 comments Download
M ash/aura/wm_shell_aura.cc View 1 chunk +0 lines, -9 lines 0 comments Download
M ash/common/shelf/shelf_widget.h View 1 chunk +2 lines, -0 lines 0 comments Download
M ash/common/shelf/shelf_widget.cc View 2 chunks +5 lines, -6 lines 0 comments Download
M ash/common/test/test_session_state_delegate.cc View 1 chunk +6 lines, -3 lines 0 comments Download
M ash/common/wm_root_window_controller.h View 1 chunk +4 lines, -0 lines 0 comments Download
M ash/common/wm_root_window_controller.cc View 1 chunk +9 lines, -0 lines 0 comments Download
M ash/common/wm_shell.h View 5 chunks +5 lines, -6 lines 0 comments Download
M ash/common/wm_shell.cc View 4 chunks +6 lines, -11 lines 0 comments Download
M ash/mus/test/ash_test_impl_mus.h View 1 chunk +0 lines, -4 lines 0 comments Download
M ash/mus/test/ash_test_impl_mus.cc View 3 chunks +0 lines, -30 lines 0 comments Download
M ash/mus/window_manager.cc View 3 chunks +5 lines, -4 lines 0 comments Download
M ash/root_window_controller_unittest.cc View 4 chunks +3 lines, -7 lines 0 comments Download
M ash/shell.h View 1 chunk +3 lines, -0 lines 0 comments Download
M ash/shell.cc View 1 chunk +5 lines, -0 lines 0 comments Download
M chrome/browser/chromeos/login/session/chrome_session_manager.cc View 2 chunks +2 lines, -7 lines 0 comments Download
M chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.cc View 2 chunks +3 lines, -0 lines 0 comments Download
M chrome/browser/ui/ash/chrome_shell_delegate.cc View 2 chunks +2 lines, -0 lines 0 comments Download
M chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc View 2 chunks +0 lines, -2 lines 0 comments Download
M chrome/browser/ui/ash/multi_user/multi_user_window_manager_stub.h View 1 chunk +2 lines, -2 lines 0 comments Download
M chrome/browser/ui/ash/multi_user/multi_user_window_manager_stub.cc View 1 chunk +0 lines, -4 lines 0 comments Download
M chrome/browser/ui/ash/session_controller_client.h View 1 chunk +0 lines, -3 lines 0 comments Download
M chrome/browser/ui/ash/session_controller_client.cc View 3 chunks +0 lines, -13 lines 0 comments Download
M chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.h View 1 chunk +0 lines, -2 lines 0 comments Download
M chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc View 6 chunks +22 lines, -8 lines 0 comments Download

Messages

Total messages: 13 (7 generated)
James Cook
TBR msw and xiyuan for revert.
3 years, 11 months ago (2017-01-10 00:57:03 UTC) #3
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.org/2619943002/1
3 years, 11 months ago (2017-01-10 00:58:19 UTC) #5
msw
bummer; lgtm
3 years, 11 months ago (2017-01-10 01:12:07 UTC) #6
commit-bot: I haz the power
Try jobs failed on following builders: linux_chromium_compile_dbg_ng on master.tryserver.chromium.linux (JOB_TIMED_OUT, no build URL)
3 years, 11 months ago (2017-01-10 02:59:49 UTC) #8
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.org/2619943002/1
3 years, 11 months ago (2017-01-10 03:28:27 UTC) #10
commit-bot: I haz the power
3 years, 11 months ago (2017-01-10 04:55:23 UTC) #13
Message was sent while issue was closed.
Committed patchset #1 (id:1) as
https://chromium.googlesource.com/chromium/src/+/e8604fbd50fd6e6b3e69f51fd794...

Powered by Google App Engine
This is Rietveld 408576698