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

Unified Diff: mash/wm/non_client_frame_controller.cc

Issue 1725353003: Eliminate mojo::Shell client lib class (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@15connector
Patch Set: . Created 4 years, 10 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/non_client_frame_controller.h ('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/non_client_frame_controller.cc
diff --git a/mash/wm/non_client_frame_controller.cc b/mash/wm/non_client_frame_controller.cc
index b35741f5c074d34b31f93a194ea545eae582664b..ed6ad3a4b285a4dad77768ee6ff98992a23d8205 100644
--- a/mash/wm/non_client_frame_controller.cc
+++ b/mash/wm/non_client_frame_controller.cc
@@ -90,9 +90,9 @@ class ContentWindowLayoutManager : public aura::LayoutManager {
class WmNativeWidgetMus : public views::NativeWidgetMus {
public:
WmNativeWidgetMus(views::internal::NativeWidgetDelegate* delegate,
- mojo::Shell* shell,
+ mojo::Connector* connector,
mus::Window* window)
- : NativeWidgetMus(delegate, shell, window,
+ : NativeWidgetMus(delegate, connector, window,
mus::mojom::SurfaceType::UNDERLAY) {}
~WmNativeWidgetMus() override {
}
@@ -166,7 +166,7 @@ class ClientViewMus : public views::ClientView {
} // namespace
NonClientFrameController::NonClientFrameController(
- mojo::Shell* shell,
+ mojo::Connector* connector,
mus::Window* window,
mus::WindowManagerClient* window_manager_client)
: widget_(new views::Widget), window_(window) {
@@ -176,7 +176,7 @@ NonClientFrameController::NonClientFrameController(
// We initiate focus at the mus level, not at the views level.
params.activatable = views::Widget::InitParams::ACTIVATABLE_NO;
params.delegate = this;
- params.native_widget = new WmNativeWidgetMus(widget_, shell, window);
+ params.native_widget = new WmNativeWidgetMus(widget_, connector, window);
widget_->Init(params);
widget_->ShowInactive();
« no previous file with comments | « mash/wm/non_client_frame_controller.h ('k') | mash/wm/root_window_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698