Moves WindowManagerInternal* into own .mojom Only the ViewManager and WindowManager implementations care about these. BUG=none TEST=none R=ben@chromium.org Review URL: https://codereview.chromium.org/663683007
diff --git a/mojo/services/public/interfaces/window_manager/BUILD.gn b/mojo/services/public/interfaces/window_manager/BUILD.gn index 3d1e55f..30c9984 100644 --- a/mojo/services/public/interfaces/window_manager/BUILD.gn +++ b/mojo/services/public/interfaces/window_manager/BUILD.gn
@@ -8,6 +8,7 @@ mojom("window_manager") { sources = [ "window_manager.mojom", + "window_manager_internal.mojom", ] deps = [
diff --git a/mojo/services/public/interfaces/window_manager/window_manager.mojom b/mojo/services/public/interfaces/window_manager/window_manager.mojom index 80e3d24..754f1ed 100644 --- a/mojo/services/public/interfaces/window_manager/window_manager.mojom +++ b/mojo/services/public/interfaces/window_manager/window_manager.mojom
@@ -13,26 +13,4 @@ Embed(string url, ServiceProvider&? service_provider); }; -// WindowManagerInternalService provides high level window management policies -// and is used by the ViewManager. This interface is marked as internal as only -// the view manager is allowed to connect to this. -[Client=WindowManagerInternalClient] -interface WindowManagerInternalService { - // Called when an input event is received from the native system. It's - // expected that when this is received the WindowManagerInternalService will - // call back to WindowManagerInternalServieClient will call - // DispatchInputEventToView(). - // TODO(sky): nuke this and instead have an interface specifically for - // dispatching events in the NativeViewportService. - OnViewInputEvent(mojo.Event event); -}; - -// ViewManager provides this interface for functionality only exposed to the -// WindowManagerInternalServie. -[Client=WindowManagerInternalService] -interface WindowManagerInternalClient { - // Dispatches the specified input event to the specified view. - DispatchInputEventToView(uint32 view_id, mojo.Event event); -}; - }
diff --git a/mojo/services/public/interfaces/window_manager/window_manager_internal.mojom b/mojo/services/public/interfaces/window_manager/window_manager_internal.mojom new file mode 100644 index 0000000..9d7fef1 --- /dev/null +++ b/mojo/services/public/interfaces/window_manager/window_manager_internal.mojom
@@ -0,0 +1,31 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +import "mojo/services/public/interfaces/input_events/input_events.mojom"; + +module mojo { + +// WindowManagerInternalService provides high level window management policies +// and is used by the ViewManager. This interface is marked as internal as only +// the view manager is allowed to connect to this. +[Client=WindowManagerInternalClient] +interface WindowManagerInternalService { + // Called when an input event is received from the native system. It's + // expected that when this is received the WindowManagerInternalService will + // call back to WindowManagerInternalServieClient will call + // DispatchInputEventToView(). + // TODO(sky): nuke this and instead have an interface specifically for + // dispatching events in the NativeViewportService. + OnViewInputEvent(mojo.Event event); +}; + +// ViewManager provides this interface for functionality only exposed to the +// WindowManagerInternalServie. +[Client=WindowManagerInternalService] +interface WindowManagerInternalClient { + // Dispatches the specified input event to the specified view. + DispatchInputEventToView(uint32 view_id, mojo.Event event); +}; + +}
diff --git a/mojo/services/view_manager/connection_manager.h b/mojo/services/view_manager/connection_manager.h index 6f5edd8..99a772d 100644 --- a/mojo/services/view_manager/connection_manager.h +++ b/mojo/services/view_manager/connection_manager.h
@@ -13,7 +13,7 @@ #include "mojo/public/cpp/bindings/array.h" #include "mojo/public/cpp/bindings/error_handler.h" #include "mojo/services/public/interfaces/view_manager/view_manager.mojom.h" -#include "mojo/services/public/interfaces/window_manager/window_manager.mojom.h" +#include "mojo/services/public/interfaces/window_manager/window_manager_internal.mojom.h" #include "mojo/services/view_manager/display_manager.h" #include "mojo/services/view_manager/ids.h" #include "mojo/services/view_manager/server_view.h"
diff --git a/mojo/services/view_manager/view_manager_unittest.cc b/mojo/services/view_manager/view_manager_unittest.cc index 9184267..1188a7f 100644 --- a/mojo/services/view_manager/view_manager_unittest.cc +++ b/mojo/services/view_manager/view_manager_unittest.cc
@@ -28,6 +28,7 @@ #include "mojo/services/public/cpp/view_manager/util.h" #include "mojo/services/public/interfaces/view_manager/view_manager.mojom.h" #include "mojo/services/public/interfaces/window_manager/window_manager.mojom.h" +#include "mojo/services/public/interfaces/window_manager/window_manager_internal.mojom.h" #include "mojo/services/view_manager/ids.h" #include "mojo/services/view_manager/test_change_tracker.h" #include "mojo/shell/shell_test_helper.h"
diff --git a/mojo/services/window_manager/window_manager_internal_service_impl.h b/mojo/services/window_manager/window_manager_internal_service_impl.h index 5733f79..3e416f3 100644 --- a/mojo/services/window_manager/window_manager_internal_service_impl.h +++ b/mojo/services/window_manager/window_manager_internal_service_impl.h
@@ -6,7 +6,7 @@ #define MOJO_SERVICES_WINDOW_MANAGER_WINDOW_MANAGER_INTERNAL_SERVICE_IMPL_H_ #include "base/basictypes.h" -#include "mojo/services/public/interfaces/window_manager/window_manager.mojom.h" +#include "mojo/services/public/interfaces/window_manager/window_manager_internal.mojom.h" namespace mojo {