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

Unified Diff: ash/mus/bridge/wm_shell_mus.cc

Issue 2739703003: Last sets of tests that can move to common_unittests (Closed)
Patch Set: comments Created 3 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 | « ash/BUILD.gn ('k') | ash/mus/window_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/mus/bridge/wm_shell_mus.cc
diff --git a/ash/mus/bridge/wm_shell_mus.cc b/ash/mus/bridge/wm_shell_mus.cc
index ad6148649b1ab4a450520d8b7efb55e2ab026b7c..e6d4b4ec7e220d794fdfb4f2aecdd479c151c743 100644
--- a/ash/mus/bridge/wm_shell_mus.cc
+++ b/ash/mus/bridge/wm_shell_mus.cc
@@ -164,7 +164,6 @@ RootWindowController* WmShellMus::GetRootWindowControllerWithDisplayId(
if (settings->display_id == id)
return root_window_controller;
}
- NOTREACHED();
return nullptr;
}
@@ -221,8 +220,9 @@ WmWindow* WmShellMus::GetPrimaryRootWindow() {
WmWindow* WmShellMus::GetRootWindowForDisplayId(int64_t display_id) {
RootWindowController* root_window_controller =
GetRootWindowControllerWithDisplayId(display_id);
- DCHECK(root_window_controller);
- return WmWindow::Get(root_window_controller->GetRootWindow());
+ return root_window_controller
+ ? WmWindow::Get(root_window_controller->GetRootWindow())
+ : nullptr;
}
const display::ManagedDisplayInfo& WmShellMus::GetDisplayInfo(
« no previous file with comments | « ash/BUILD.gn ('k') | ash/mus/window_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698