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

Unified Diff: ash/mus/bridge/wm_shell_mus.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 | « no previous file | ash/mus/bridge/wm_window_mus.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 7c720a87d6ad8e634e968596c9a8b9bbe164bea0..14e55b05560e749b9849c9b5f4c5583c15f8359d 100644
--- a/ash/mus/bridge/wm_shell_mus.cc
+++ b/ash/mus/bridge/wm_shell_mus.cc
@@ -204,7 +204,12 @@ WmRootWindowControllerMus* WmShellMus::GetRootWindowControllerWithDisplayId(
WmWindow* WmShellMus::NewWindow(ui::wm::WindowType window_type,
ui::LayerType layer_type) {
- WmWindowMus* window = WmWindowMus::Get(window_tree_client()->NewWindow());
+ ui::Window* uiwindow = nullptr;
+ if (layer_type == ui::LAYER_NOT_DRAWN)
+ uiwindow = window_tree_client()->NewWindowContainer();
+ else
+ uiwindow = window_tree_client()->NewWindow();
+ WmWindowMus* window = WmWindowMus::Get(uiwindow);
window->set_wm_window_type(window_type);
// TODO(sky): support layer_type.
NOTIMPLEMENTED();
« no previous file with comments | « no previous file | ash/mus/bridge/wm_window_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698