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

Unified Diff: trunk/src/ash/root_window_controller.cc

Issue 205313002: Revert 258077 "Remove PrepareForShutdown" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 9 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
« no previous file with comments | « trunk/src/ash/display/screen_ash.cc ('k') | trunk/src/ash/root_window_settings.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/ash/root_window_controller.cc
===================================================================
--- trunk/src/ash/root_window_controller.cc (revision 258102)
+++ trunk/src/ash/root_window_controller.cc (working copy)
@@ -354,7 +354,8 @@
// ends up with invalid display.
internal::GetRootWindowSettings(root_window())->display_id =
gfx::Display::kInvalidDisplayID;
- internal::GetRootWindowSettings(root_window())->shutdown = true;
+ // And this root window should no longer process events.
+ host()->dispatcher()->PrepareForShutdown();
system_background_.reset();
aura::client::SetScreenPositionClient(root_window(), NULL);
« no previous file with comments | « trunk/src/ash/display/screen_ash.cc ('k') | trunk/src/ash/root_window_settings.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698