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

Side by Side Diff: mash/wm/bridge/wm_root_window_controller_mus.cc

Issue 2012343002: Converts overview to use common ash types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: feedback Created 4 years, 6 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 unified diff | Download patch
« no previous file with comments | « mash/wm/bridge/wm_globals_mus.cc ('k') | mash/wm/bridge/wm_window_mus.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "mash/wm/bridge/wm_root_window_controller_mus.h" 5 #include "mash/wm/bridge/wm_root_window_controller_mus.h"
6 6
7 #include "ash/wm/common/wm_root_window_controller_observer.h" 7 #include "ash/wm/common/wm_root_window_controller_observer.h"
8 #include "components/mus/public/cpp/window.h" 8 #include "components/mus/public/cpp/window.h"
9 #include "components/mus/public/cpp/window_property.h" 9 #include "components/mus/public/cpp/window_property.h"
10 #include "components/mus/public/cpp/window_tree_connection.h" 10 #include "components/mus/public/cpp/window_tree_connection.h"
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 void WmRootWindowControllerMus::ConfigureWidgetInitParamsForContainer( 105 void WmRootWindowControllerMus::ConfigureWidgetInitParamsForContainer(
106 views::Widget* widget, 106 views::Widget* widget,
107 int shell_container_id, 107 int shell_container_id,
108 views::Widget::InitParams* init_params) { 108 views::Widget::InitParams* init_params) {
109 init_params->parent_mus = WmWindowMus::GetMusWindow( 109 init_params->parent_mus = WmWindowMus::GetMusWindow(
110 WmWindowMus::Get(root_window_controller_->root()) 110 WmWindowMus::Get(root_window_controller_->root())
111 ->GetChildByShellWindowId(shell_container_id)); 111 ->GetChildByShellWindowId(shell_container_id));
112 DCHECK(init_params->parent_mus); 112 DCHECK(init_params->parent_mus);
113 mus::Window* new_window = 113 mus::Window* new_window =
114 root_window_controller_->root()->connection()->NewWindow(); 114 root_window_controller_->root()->connection()->NewWindow();
115 WmWindowMus::Get(new_window)->set_widget(widget); 115 WmWindowMus::Get(new_window)
116 ->set_widget(widget, WmWindowMus::WidgetCreationType::INTERNAL);
116 init_params->native_widget = new views::NativeWidgetMus( 117 init_params->native_widget = new views::NativeWidgetMus(
117 widget, root_window_controller_->GetConnector(), new_window, 118 widget, root_window_controller_->GetConnector(), new_window,
118 mus::mojom::SurfaceType::DEFAULT); 119 mus::mojom::SurfaceType::DEFAULT);
119 } 120 }
120 121
121 ash::wm::WmWindow* WmRootWindowControllerMus::FindEventTarget( 122 ash::wm::WmWindow* WmRootWindowControllerMus::FindEventTarget(
122 const gfx::Point& location_in_screen) { 123 const gfx::Point& location_in_screen) {
123 NOTIMPLEMENTED(); 124 NOTIMPLEMENTED();
124 return nullptr; 125 return nullptr;
125 } 126 }
126 127
127 void WmRootWindowControllerMus::AddObserver( 128 void WmRootWindowControllerMus::AddObserver(
128 ash::wm::WmRootWindowControllerObserver* observer) { 129 ash::wm::WmRootWindowControllerObserver* observer) {
129 observers_.AddObserver(observer); 130 observers_.AddObserver(observer);
130 } 131 }
131 132
132 void WmRootWindowControllerMus::RemoveObserver( 133 void WmRootWindowControllerMus::RemoveObserver(
133 ash::wm::WmRootWindowControllerObserver* observer) { 134 ash::wm::WmRootWindowControllerObserver* observer) {
134 observers_.RemoveObserver(observer); 135 observers_.RemoveObserver(observer);
135 } 136 }
136 137
137 } // namespace wm 138 } // namespace wm
138 } // namespace mash 139 } // namespace mash
OLDNEW
« no previous file with comments | « mash/wm/bridge/wm_globals_mus.cc ('k') | mash/wm/bridge/wm_window_mus.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698