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

Unified Diff: mash/wm/bridge/wm_root_window_controller_mus.cc

Issue 2010473003: Wires up shelf to panel and dock layoutmanagers (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: comment Created 4 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 | « mash/wm/BUILD.gn ('k') | mash/wm/root_window_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mash/wm/bridge/wm_root_window_controller_mus.cc
diff --git a/mash/wm/bridge/wm_root_window_controller_mus.cc b/mash/wm/bridge/wm_root_window_controller_mus.cc
index 658983700221f0fd708d64790bfbb3cfb5ba8f9f..9b01ef22aaaa1321fd29a21a1eeae9d6c3078555 100644
--- a/mash/wm/bridge/wm_root_window_controller_mus.cc
+++ b/mash/wm/bridge/wm_root_window_controller_mus.cc
@@ -106,8 +106,9 @@ void WmRootWindowControllerMus::ConfigureWidgetInitParamsForContainer(
views::Widget* widget,
int shell_container_id,
views::Widget::InitParams* init_params) {
- init_params->parent_mus =
- root_window_controller_->root()->GetChildByLocalId(shell_container_id);
+ init_params->parent_mus = WmWindowMus::GetMusWindow(
+ WmWindowMus::Get(root_window_controller_->root())
+ ->GetChildByShellWindowId(shell_container_id));
DCHECK(init_params->parent_mus);
mus::Window* new_window =
root_window_controller_->root()->connection()->NewWindow();
« no previous file with comments | « mash/wm/BUILD.gn ('k') | mash/wm/root_window_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698