| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ash/mus/bridge/wm_root_window_controller_mus.h" | 5 #include "ash/mus/bridge/wm_root_window_controller_mus.h" |
| 6 | 6 |
| 7 #include "ash/common/wm/workspace/workspace_layout_manager.h" | 7 #include "ash/common/wm/workspace/workspace_layout_manager.h" |
| 8 #include "ash/common/wm/workspace/workspace_layout_manager_backdrop_delegate.h" | 8 #include "ash/common/wm/workspace/workspace_layout_manager_backdrop_delegate.h" |
| 9 #include "ash/common/wm_root_window_controller_observer.h" | 9 #include "ash/common/wm_root_window_controller_observer.h" |
| 10 #include "ash/mus/bridge/wm_shelf_mus.h" | 10 #include "ash/mus/bridge/wm_shelf_mus.h" |
| (...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 115 | 115 |
| 116 void WmRootWindowControllerMus::ConfigureWidgetInitParamsForContainer( | 116 void WmRootWindowControllerMus::ConfigureWidgetInitParamsForContainer( |
| 117 views::Widget* widget, | 117 views::Widget* widget, |
| 118 int shell_container_id, | 118 int shell_container_id, |
| 119 views::Widget::InitParams* init_params) { | 119 views::Widget::InitParams* init_params) { |
| 120 init_params->parent_mus = WmWindowMus::GetMusWindow( | 120 init_params->parent_mus = WmWindowMus::GetMusWindow( |
| 121 WmWindowMus::Get(root_window_controller_->root()) | 121 WmWindowMus::Get(root_window_controller_->root()) |
| 122 ->GetChildByShellWindowId(shell_container_id)); | 122 ->GetChildByShellWindowId(shell_container_id)); |
| 123 DCHECK(init_params->parent_mus); | 123 DCHECK(init_params->parent_mus); |
| 124 ui::Window* new_window = | 124 ui::Window* new_window = |
| 125 root_window_controller_->root()->window_tree()->NewWindow(); | 125 root_window_controller_->root()->window_tree()->NewWindow( |
| 126 &(init_params->mus_properties)); |
| 126 WmWindowMus::Get(new_window) | 127 WmWindowMus::Get(new_window) |
| 127 ->set_widget(widget, WmWindowMus::WidgetCreationType::INTERNAL); | 128 ->set_widget(widget, WmWindowMus::WidgetCreationType::INTERNAL); |
| 128 init_params->native_widget = new views::NativeWidgetMus( | 129 init_params->native_widget = new views::NativeWidgetMus( |
| 129 widget, new_window, ui::mojom::SurfaceType::DEFAULT); | 130 widget, new_window, ui::mojom::SurfaceType::DEFAULT); |
| 130 } | 131 } |
| 131 | 132 |
| 132 WmWindow* WmRootWindowControllerMus::FindEventTarget( | 133 WmWindow* WmRootWindowControllerMus::FindEventTarget( |
| 133 const gfx::Point& location_in_screen) { | 134 const gfx::Point& location_in_screen) { |
| 134 NOTIMPLEMENTED(); | 135 NOTIMPLEMENTED(); |
| 135 return nullptr; | 136 return nullptr; |
| (...skipping 13 matching lines...) Expand all Loading... |
| 149 observers_.AddObserver(observer); | 150 observers_.AddObserver(observer); |
| 150 } | 151 } |
| 151 | 152 |
| 152 void WmRootWindowControllerMus::RemoveObserver( | 153 void WmRootWindowControllerMus::RemoveObserver( |
| 153 WmRootWindowControllerObserver* observer) { | 154 WmRootWindowControllerObserver* observer) { |
| 154 observers_.RemoveObserver(observer); | 155 observers_.RemoveObserver(observer); |
| 155 } | 156 } |
| 156 | 157 |
| 157 } // namespace mus | 158 } // namespace mus |
| 158 } // namespace ash | 159 } // namespace ash |
| OLD | NEW |