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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/display/screen_ash.cc

Issue 1645503004: [exp] ash: sysui for mash (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ash-in-mus
Patch Set: . Created 4 years, 11 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 | « ash/desktop_background/desktop_background_controller.cc ('k') | ash/host/ash_window_tree_host.h » ('j') | ash/host/ash_window_tree_host.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/screen_ash.cc
diff --git a/ash/display/screen_ash.cc b/ash/display/screen_ash.cc
index d5c33a4e65b5f2c7e37828f13c25fb7be3cf048f..853669206f8301d1646bcde8d97e49a12b00cda8 100644
--- a/ash/display/screen_ash.cc
+++ b/ash/display/screen_ash.cc
@@ -130,6 +130,8 @@ gfx::Display ScreenAsh::GetDisplayNearestWindow(gfx::NativeView window) const {
if (!root_window)
return GetPrimaryDisplay();
const RootWindowSettings* rws = GetRootWindowSettings(root_window);
+ if (!rws)
+ return GetPrimaryDisplay();
sky 2016/02/03 22:43:48 Code like this shouldn't be hit. I think we should
sadrul 2016/02/04 00:03:42 Acknowledged.
int64_t id = rws->display_id;
// if id is |kInvaildDisplayID|, it's being deleted.
DCHECK(id != gfx::Display::kInvalidDisplayID);
« no previous file with comments | « ash/desktop_background/desktop_background_controller.cc ('k') | ash/host/ash_window_tree_host.h » ('j') | ash/host/ash_window_tree_host.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698