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

Unified Diff: mash/wm/non_client_frame_controller.cc

Issue 1882423004: Move shell service to toplevel shell namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 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 81dc82b7fb1f2fb5756d19473babbf45f649742d..51661774292f1c57387d6ecc7ea92570983ea6b7 100644
--- a/mash/wm/non_client_frame_controller.cc
+++ b/mash/wm/non_client_frame_controller.cc
@@ -92,9 +92,11 @@ class ContentWindowLayoutManager : public aura::LayoutManager {
class WmNativeWidgetMus : public views::NativeWidgetMus {
public:
WmNativeWidgetMus(views::internal::NativeWidgetDelegate* delegate,
- mojo::Connector* connector,
+ shell::Connector* connector,
mus::Window* window)
- : NativeWidgetMus(delegate, connector, window,
+ : NativeWidgetMus(delegate,
+ connector,
+ window,
mus::mojom::SurfaceType::UNDERLAY) {}
~WmNativeWidgetMus() override {
}
@@ -177,7 +179,7 @@ class ClientViewMus : public views::ClientView {
// static
void NonClientFrameController::Create(
- mojo::Connector* connector,
+ shell::Connector* connector,
mus::Window* window,
mus::WindowManagerClient* window_manager_client) {
new NonClientFrameController(connector, window, window_manager_client);
@@ -194,7 +196,7 @@ int NonClientFrameController::GetMaxTitleBarButtonWidth() {
}
NonClientFrameController::NonClientFrameController(
- mojo::Connector* connector,
+ shell::Connector* connector,
mus::Window* window,
mus::WindowManagerClient* window_manager_client)
: widget_(new views::Widget), window_(window) {
« 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