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

Unified Diff: ash/mus/root_window_controller.cc

Issue 2369793002: WIP: Propagate SurfaceID up window tree hierarchy
Patch Set: Fix input events: EventDispatcher ignores container windows Created 4 years, 3 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/mus/non_client_frame_controller.cc ('k') | cc/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/mus/root_window_controller.cc
diff --git a/ash/mus/root_window_controller.cc b/ash/mus/root_window_controller.cc
index c0ebce22f45a09aec54082ba165ba7a090786c10..3fc8b15acf3defd7e1c5b388b330034168df17a6 100644
--- a/ash/mus/root_window_controller.cc
+++ b/ash/mus/root_window_controller.cc
@@ -61,6 +61,7 @@ RootWindowController::RootWindowController(WindowManager* window_manager,
wm_root_window_controller_->CreateLayoutManagers();
CreateLayoutManagers();
+ root_->SetIsContainer();
disconnected_app_handler_.reset(new DisconnectedAppHandler(root));
// Force a layout of the root, and its children, RootWindowLayout handles
@@ -100,6 +101,7 @@ ui::Window* RootWindowController::NewTopLevelWindow(
// TODO(sky): constrain and validate properties before passing to server.
ui::Window* window = root_->window_tree()->NewWindow(properties);
window->SetBounds(CalculateDefaultBounds(window));
+ // window->SetIsContainer();
ui::Window* container_window = nullptr;
mojom::Container container;
@@ -110,6 +112,7 @@ ui::Window* RootWindowController::NewTopLevelWindow(
container_window = WmWindowMus::GetMusWindow(wm::GetDefaultParent(
WmWindowMus::Get(root_), WmWindowMus::Get(window), window->bounds()));
}
+ container_window->SetIsContainer();
DCHECK(WmWindowMus::Get(container_window)->IsContainer());
if (provide_non_client_frame) {
« no previous file with comments | « ash/mus/non_client_frame_controller.cc ('k') | cc/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698