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

Unified Diff: ash/wm/container_finder.cc

Issue 2896273004: chromeos: converts PanelLayoutManager to aura::Window (Closed)
Patch Set: feedback Created 3 years, 7 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/wm/always_on_top_controller.cc ('k') | ash/wm/overview/window_selector.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/container_finder.cc
diff --git a/ash/wm/container_finder.cc b/ash/wm/container_finder.cc
index 3b4a99caa9dff473420027083d6b7eaf74b305f9..e5cb9aabf492b5e5ce90fb5f6a64708209b5a768 100644
--- a/ash/wm/container_finder.cc
+++ b/ash/wm/container_finder.cc
@@ -60,10 +60,9 @@ aura::Window* GetSystemModalContainer(aura::Window* root,
aura::Window* GetContainerFromAlwaysOnTopController(aura::Window* root,
aura::Window* window) {
- WmWindow* result = RootWindowController::ForWindow(root)
- ->always_on_top_controller()
- ->GetContainer(WmWindow::Get(window));
- return result ? result->aura_window() : nullptr;
+ return RootWindowController::ForWindow(root)
+ ->always_on_top_controller()
+ ->GetContainer(window);
}
} // namespace
« no previous file with comments | « ash/wm/always_on_top_controller.cc ('k') | ash/wm/overview/window_selector.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698