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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: trunk/src/ash/display/screen_ash.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/mouse_cursor_event_filter.cc ('k') | trunk/src/ash/root_window_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/ash/display/screen_ash.cc
===================================================================
--- trunk/src/ash/display/screen_ash.cc (revision 258102)
+++ trunk/src/ash/display/screen_ash.cc (working copy)
@@ -232,11 +232,7 @@
const aura::Window* root_window = window->GetRootWindow();
if (!root_window)
return GetPrimaryDisplay();
- const internal::RootWindowSettings* rws =
- internal::GetRootWindowSettings(root_window);
- if (rws->shutdown)
- return gfx::Display();
- int64 id = rws->display_id;
+ int64 id = internal::GetRootWindowSettings(root_window)->display_id;
// if id is |kInvaildDisplayID|, it's being deleted.
DCHECK(id != gfx::Display::kInvalidDisplayID);
« no previous file with comments | « trunk/src/ash/display/mouse_cursor_event_filter.cc ('k') | trunk/src/ash/root_window_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698