Move //mojo/services/X/public/... to //mojo/services/X/... (part 4).
X = vanadium/security,
view_manager,
window_manager
(This is the last one, except for network, which is pulled from monet.)
R=jamesr@chromium.org
Review URL: https://codereview.chromium.org/1391243003 .
diff --git a/apps/moterm/BUILD.gn b/apps/moterm/BUILD.gn
index 67c6479..3513168 100644
--- a/apps/moterm/BUILD.gn
+++ b/apps/moterm/BUILD.gn
@@ -26,7 +26,7 @@
"//mojo/services/files/interfaces",
"//mojo/services/surfaces/interfaces:surface_id",
"//mojo/services/terminal/interfaces",
- "//mojo/services/view_manager/public/cpp",
+ "//mojo/services/view_manager/cpp",
"//skia",
"//third_party/dejavu-fonts-ttf-2.34:DejaVuSansMonoRegular",
]
diff --git a/apps/moterm/moterm_main.cc b/apps/moterm/moterm_main.cc
index a1a79bb..299a3b4 100644
--- a/apps/moterm/moterm_main.cc
+++ b/apps/moterm/moterm_main.cc
@@ -14,9 +14,9 @@
#include "mojo/public/cpp/application/application_connection.h"
#include "mojo/public/cpp/application/application_delegate.h"
#include "mojo/public/cpp/application/application_impl.h"
-#include "mojo/services/view_manager/public/cpp/view_manager.h"
-#include "mojo/services/view_manager/public/cpp/view_manager_client_factory.h"
-#include "mojo/services/view_manager/public/cpp/view_manager_delegate.h"
+#include "mojo/services/view_manager/cpp/view_manager.h"
+#include "mojo/services/view_manager/cpp/view_manager_client_factory.h"
+#include "mojo/services/view_manager/cpp/view_manager_delegate.h"
namespace {
diff --git a/apps/moterm/moterm_view.h b/apps/moterm/moterm_view.h
index 01f5d00..4929e4a 100644
--- a/apps/moterm/moterm_view.h
+++ b/apps/moterm/moterm_view.h
@@ -17,7 +17,7 @@
#include "mojo/public/cpp/bindings/interface_request.h"
#include "mojo/services/surfaces/interfaces/surface_id.mojom.h"
#include "mojo/services/terminal/interfaces/terminal.mojom.h"
-#include "mojo/services/view_manager/public/cpp/view_observer.h"
+#include "mojo/services/view_manager/cpp/view_observer.h"
#include "skia/ext/refptr.h"
#include "third_party/skia/include/core/SkBitmapDevice.h"
#include "third_party/skia/include/core/SkTypeface.h"
diff --git a/examples/bank_app/BUILD.gn b/examples/bank_app/BUILD.gn
index ec59eb2..de53fc6 100644
--- a/examples/bank_app/BUILD.gn
+++ b/examples/bank_app/BUILD.gn
@@ -20,7 +20,7 @@
"//mojo/public/cpp/application:standalone",
"//mojo/public/cpp/bindings",
"//mojo/public/cpp/utility",
- "//mojo/services/vanadium/security/public/interfaces",
+ "//mojo/services/vanadium/security/interfaces",
]
sources = [
@@ -37,7 +37,7 @@
"//mojo/public/cpp/application:standalone",
"//mojo/public/cpp/bindings",
"//mojo/public/cpp/utility",
- "//mojo/services/vanadium/security/public/interfaces",
+ "//mojo/services/vanadium/security/interfaces",
]
sources = [
diff --git a/examples/bank_app/bank.cc b/examples/bank_app/bank.cc
index 91c6cfe..09ca954 100644
--- a/examples/bank_app/bank.cc
+++ b/examples/bank_app/bank.cc
@@ -12,7 +12,7 @@
#include "mojo/public/cpp/application/interface_factory.h"
#include "mojo/public/cpp/bindings/strong_binding.h"
#include "mojo/public/cpp/utility/run_loop.h"
-#include "mojo/services/vanadium/security/public/interfaces/principal.mojom.h"
+#include "mojo/services/vanadium/security/interfaces/principal.mojom.h"
namespace examples {
diff --git a/examples/bank_app/customer.cc b/examples/bank_app/customer.cc
index 5533f5d..7fb227f 100644
--- a/examples/bank_app/customer.cc
+++ b/examples/bank_app/customer.cc
@@ -9,7 +9,7 @@
#include "mojo/public/cpp/application/application_impl.h"
#include "mojo/public/cpp/application/application_runner.h"
#include "mojo/public/cpp/utility/run_loop.h"
-#include "mojo/services/vanadium/security/public/interfaces/principal.mojom.h"
+#include "mojo/services/vanadium/security/interfaces/principal.mojom.h"
namespace examples {
diff --git a/examples/bitmap_uploader/BUILD.gn b/examples/bitmap_uploader/BUILD.gn
index af13601..9d21e86 100644
--- a/examples/bitmap_uploader/BUILD.gn
+++ b/examples/bitmap_uploader/BUILD.gn
@@ -23,8 +23,8 @@
"//mojo/services/input_events/interfaces",
"//mojo/services/surfaces/cpp",
"//mojo/services/surfaces/interfaces:surface_id",
- "//mojo/services/view_manager/public/cpp",
- "//mojo/services/view_manager/public/interfaces",
+ "//mojo/services/view_manager/cpp",
+ "//mojo/services/view_manager/interfaces",
"//ui/gfx/geometry",
]
}
diff --git a/examples/bitmap_uploader/bitmap_uploader.cc b/examples/bitmap_uploader/bitmap_uploader.cc
index 066ec51..f1fd4b1 100644
--- a/examples/bitmap_uploader/bitmap_uploader.cc
+++ b/examples/bitmap_uploader/bitmap_uploader.cc
@@ -17,7 +17,7 @@
#include "mojo/public/interfaces/application/shell.mojom.h"
#include "mojo/services/geometry/cpp/geometry_util.h"
#include "mojo/services/surfaces/cpp/surfaces_utils.h"
-#include "mojo/services/view_manager/public/cpp/lib/view_manager_client_impl.h"
+#include "mojo/services/view_manager/cpp/lib/view_manager_client_impl.h"
#include "ui/gfx/geometry/rect.h"
#define TRANSPARENT_COLOR 0x00000000
diff --git a/examples/browser/BUILD.gn b/examples/browser/BUILD.gn
index eae50f0..84dccc3 100644
--- a/examples/browser/BUILD.gn
+++ b/examples/browser/BUILD.gn
@@ -19,8 +19,8 @@
"//mojo/converters/geometry",
"//mojo/services/geometry/interfaces",
"//mojo/services/navigation/interfaces",
- "//mojo/services/view_manager/public/cpp",
- "//mojo/services/view_manager/public/interfaces",
+ "//mojo/services/view_manager/cpp",
+ "//mojo/services/view_manager/interfaces",
"//third_party/icu",
"//url",
]
diff --git a/examples/browser/browser.cc b/examples/browser/browser.cc
index 89e6baa..33572c5 100644
--- a/examples/browser/browser.cc
+++ b/examples/browser/browser.cc
@@ -16,11 +16,11 @@
#include "mojo/public/cpp/application/connect.h"
#include "mojo/public/cpp/application/service_provider_impl.h"
#include "mojo/services/navigation/interfaces/navigation.mojom.h"
-#include "mojo/services/view_manager/public/cpp/view.h"
-#include "mojo/services/view_manager/public/cpp/view_manager.h"
-#include "mojo/services/view_manager/public/cpp/view_manager_client_factory.h"
-#include "mojo/services/view_manager/public/cpp/view_manager_delegate.h"
-#include "mojo/services/view_manager/public/cpp/view_observer.h"
+#include "mojo/services/view_manager/cpp/view.h"
+#include "mojo/services/view_manager/cpp/view_manager.h"
+#include "mojo/services/view_manager/cpp/view_manager_client_factory.h"
+#include "mojo/services/view_manager/cpp/view_manager_delegate.h"
+#include "mojo/services/view_manager/cpp/view_observer.h"
#include "url/gurl.h"
namespace mojo {
diff --git a/examples/embedded_app/BUILD.gn b/examples/embedded_app/BUILD.gn
index 388b227..64d667f 100644
--- a/examples/embedded_app/BUILD.gn
+++ b/examples/embedded_app/BUILD.gn
@@ -17,7 +17,7 @@
"//mojo/public/cpp/utility",
"//mojo/services/geometry/interfaces",
"//mojo/services/navigation/interfaces",
- "//mojo/services/view_manager/public/cpp",
+ "//mojo/services/view_manager/cpp",
"//skia:skia",
"//url",
]
diff --git a/examples/embedded_app/embedded_app.cc b/examples/embedded_app/embedded_app.cc
index 1b0f4f0..e8e2bf4 100644
--- a/examples/embedded_app/embedded_app.cc
+++ b/examples/embedded_app/embedded_app.cc
@@ -16,11 +16,11 @@
#include "mojo/public/cpp/application/connect.h"
#include "mojo/public/cpp/application/interface_factory_impl.h"
#include "mojo/services/navigation/interfaces/navigation.mojom.h"
-#include "mojo/services/view_manager/public/cpp/view.h"
-#include "mojo/services/view_manager/public/cpp/view_manager.h"
-#include "mojo/services/view_manager/public/cpp/view_manager_client_factory.h"
-#include "mojo/services/view_manager/public/cpp/view_manager_delegate.h"
-#include "mojo/services/view_manager/public/cpp/view_observer.h"
+#include "mojo/services/view_manager/cpp/view.h"
+#include "mojo/services/view_manager/cpp/view_manager.h"
+#include "mojo/services/view_manager/cpp/view_manager_client_factory.h"
+#include "mojo/services/view_manager/cpp/view_manager_delegate.h"
+#include "mojo/services/view_manager/cpp/view_observer.h"
#include "third_party/skia/include/core/SkColor.h"
#include "url/gurl.h"
#include "url/url_util.h"
diff --git a/examples/ganesh_app/BUILD.gn b/examples/ganesh_app/BUILD.gn
index 956eefd..915558c 100644
--- a/examples/ganesh_app/BUILD.gn
+++ b/examples/ganesh_app/BUILD.gn
@@ -28,7 +28,7 @@
"//mojo/services/surfaces/cpp",
"//mojo/services/surfaces/interfaces",
"//mojo/services/surfaces/interfaces:surface_id",
- "//mojo/services/view_manager/public/cpp",
+ "//mojo/services/view_manager/cpp",
"//mojo/skia",
"//skia",
]
diff --git a/examples/ganesh_app/ganesh_app.cc b/examples/ganesh_app/ganesh_app.cc
index 51c9407..c382765 100644
--- a/examples/ganesh_app/ganesh_app.cc
+++ b/examples/ganesh_app/ganesh_app.cc
@@ -11,9 +11,9 @@
#include "mojo/public/cpp/application/application_connection.h"
#include "mojo/public/cpp/application/application_delegate.h"
#include "mojo/public/cpp/application/application_impl.h"
-#include "mojo/services/view_manager/public/cpp/view_manager.h"
-#include "mojo/services/view_manager/public/cpp/view_manager_client_factory.h"
-#include "mojo/services/view_manager/public/cpp/view_manager_delegate.h"
+#include "mojo/services/view_manager/cpp/view_manager.h"
+#include "mojo/services/view_manager/cpp/view_manager_client_factory.h"
+#include "mojo/services/view_manager/cpp/view_manager_delegate.h"
namespace examples {
diff --git a/examples/ganesh_app/ganesh_view.h b/examples/ganesh_app/ganesh_view.h
index c95b497..e2c0c21 100644
--- a/examples/ganesh_app/ganesh_view.h
+++ b/examples/ganesh_app/ganesh_view.h
@@ -8,7 +8,7 @@
#include "examples/ganesh_app/texture_uploader.h"
#include "mojo/gpu/gl_context.h"
#include "mojo/services/surfaces/interfaces/surface_id.mojom.h"
-#include "mojo/services/view_manager/public/cpp/view_observer.h"
+#include "mojo/services/view_manager/cpp/view_observer.h"
#include "mojo/skia/ganesh_context.h"
namespace mojo {
diff --git a/examples/js/show_image.js b/examples/js/show_image.js
index 174fbc2..b71522b 100644
--- a/examples/js/show_image.js
+++ b/examples/js/show_image.js
@@ -1,4 +1,8 @@
#!mojo mojo:js_content_handler
+// 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.
+
// Demonstrate using the mojo window_manager application to "embed" a view that
// displays an image. To run this application set BUILD_DIR to the build
// directory (like "src/out/Debug") and append a PNG image URL as the url
@@ -13,7 +17,7 @@
define("main", [
"mojo/services/public/js/application",
"mojo/services/public/js/service_provider",
- "mojo/services/window_manager/public/interfaces/window_manager.mojom",
+ "mojo/services/window_manager/interfaces/window_manager.mojom",
"third_party/js/url",
], function(application, serviceProvider, windowManager, url) {
diff --git a/examples/keyboard_client/BUILD.gn b/examples/keyboard_client/BUILD.gn
index 4cd2dd8..2897b30 100644
--- a/examples/keyboard_client/BUILD.gn
+++ b/examples/keyboard_client/BUILD.gn
@@ -20,7 +20,7 @@
"//mojo/services/surfaces/cpp",
"//mojo/services/surfaces/interfaces:interfaces_cpp_sources",
"//mojo/services/surfaces/interfaces:surface_id_cpp_sources",
- "//mojo/services/view_manager/public/cpp",
+ "//mojo/services/view_manager/cpp",
"//mojo/skia:skia",
"//skia",
]
diff --git a/examples/keyboard_client/keyboard_client.cc b/examples/keyboard_client/keyboard_client.cc
index e40206f..4c2fa8d 100644
--- a/examples/keyboard_client/keyboard_client.cc
+++ b/examples/keyboard_client/keyboard_client.cc
@@ -15,11 +15,11 @@
#include "mojo/public/cpp/application/application_impl.h"
#include "mojo/public/cpp/application/connect.h"
#include "mojo/services/keyboard/interfaces/keyboard.mojom.h"
-#include "mojo/services/view_manager/public/cpp/view.h"
-#include "mojo/services/view_manager/public/cpp/view_manager.h"
-#include "mojo/services/view_manager/public/cpp/view_manager_client_factory.h"
-#include "mojo/services/view_manager/public/cpp/view_manager_delegate.h"
-#include "mojo/services/view_manager/public/cpp/view_observer.h"
+#include "mojo/services/view_manager/cpp/view.h"
+#include "mojo/services/view_manager/cpp/view_manager.h"
+#include "mojo/services/view_manager/cpp/view_manager_client_factory.h"
+#include "mojo/services/view_manager/cpp/view_manager_delegate.h"
+#include "mojo/services/view_manager/cpp/view_observer.h"
#include "mojo/skia/ganesh_context.h"
#include "mojo/skia/ganesh_surface.h"
#include "third_party/skia/include/core/SkCanvas.h"
diff --git a/examples/moterm_example_app/BUILD.gn b/examples/moterm_example_app/BUILD.gn
index 3a01292..8ed0c0e 100644
--- a/examples/moterm_example_app/BUILD.gn
+++ b/examples/moterm_example_app/BUILD.gn
@@ -19,6 +19,6 @@
"//mojo/services/files/interfaces",
"//mojo/services/geometry/interfaces",
"//mojo/services/terminal/interfaces",
- "//mojo/services/view_manager/public/cpp",
+ "//mojo/services/view_manager/cpp",
]
}
diff --git a/examples/moterm_example_app/moterm_example_app.cc b/examples/moterm_example_app/moterm_example_app.cc
index 25379ad..9fabc34 100644
--- a/examples/moterm_example_app/moterm_example_app.cc
+++ b/examples/moterm_example_app/moterm_example_app.cc
@@ -27,11 +27,11 @@
#include "mojo/services/files/interfaces/types.mojom.h"
#include "mojo/services/terminal/interfaces/terminal.mojom.h"
#include "mojo/services/terminal/interfaces/terminal_client.mojom.h"
-#include "mojo/services/view_manager/public/cpp/view.h"
-#include "mojo/services/view_manager/public/cpp/view_manager.h"
-#include "mojo/services/view_manager/public/cpp/view_manager_client_factory.h"
-#include "mojo/services/view_manager/public/cpp/view_manager_delegate.h"
-#include "mojo/services/view_manager/public/cpp/view_observer.h"
+#include "mojo/services/view_manager/cpp/view.h"
+#include "mojo/services/view_manager/cpp/view_manager.h"
+#include "mojo/services/view_manager/cpp/view_manager_client_factory.h"
+#include "mojo/services/view_manager/cpp/view_manager_delegate.h"
+#include "mojo/services/view_manager/cpp/view_observer.h"
// Kind of like |fputs()| (doesn't wait for result).
void Fputs(mojo::files::File* file, const char* s) {
diff --git a/examples/nesting_app/BUILD.gn b/examples/nesting_app/BUILD.gn
index 57e2125..67107a1 100644
--- a/examples/nesting_app/BUILD.gn
+++ b/examples/nesting_app/BUILD.gn
@@ -18,7 +18,7 @@
"//mojo/public/cpp/utility",
"//mojo/services/geometry/interfaces",
"//mojo/services/navigation/interfaces",
- "//mojo/services/view_manager/public/cpp",
+ "//mojo/services/view_manager/cpp",
"//skia",
"//url",
]
diff --git a/examples/nesting_app/nesting_app.cc b/examples/nesting_app/nesting_app.cc
index 30ae0bd..a13b086 100644
--- a/examples/nesting_app/nesting_app.cc
+++ b/examples/nesting_app/nesting_app.cc
@@ -14,11 +14,11 @@
#include "mojo/public/cpp/application/application_delegate.h"
#include "mojo/public/cpp/application/application_impl.h"
#include "mojo/public/cpp/application/interface_factory_impl.h"
-#include "mojo/services/view_manager/public/cpp/view.h"
-#include "mojo/services/view_manager/public/cpp/view_manager.h"
-#include "mojo/services/view_manager/public/cpp/view_manager_client_factory.h"
-#include "mojo/services/view_manager/public/cpp/view_manager_delegate.h"
-#include "mojo/services/view_manager/public/cpp/view_observer.h"
+#include "mojo/services/view_manager/cpp/view.h"
+#include "mojo/services/view_manager/cpp/view_manager.h"
+#include "mojo/services/view_manager/cpp/view_manager_client_factory.h"
+#include "mojo/services/view_manager/cpp/view_manager_delegate.h"
+#include "mojo/services/view_manager/cpp/view_observer.h"
#include "third_party/skia/include/core/SkColor.h"
#include "url/gurl.h"
diff --git a/examples/nfc_sender/BUILD.gn b/examples/nfc_sender/BUILD.gn
index 503eb75..b2e4f73 100644
--- a/examples/nfc_sender/BUILD.gn
+++ b/examples/nfc_sender/BUILD.gn
@@ -17,7 +17,7 @@
"//mojo/public/interfaces/application:application__generator",
"//mojo/services/geometry/interfaces",
"//mojo/services/nfc/interfaces",
- "//mojo/services/view_manager/public/cpp",
+ "//mojo/services/view_manager/cpp",
"//mojo/skia",
"//skia",
"//ui/gfx/geometry",
diff --git a/examples/nfc_sender/nfc_sender.cc b/examples/nfc_sender/nfc_sender.cc
index 55519b8..1a56dd5 100644
--- a/examples/nfc_sender/nfc_sender.cc
+++ b/examples/nfc_sender/nfc_sender.cc
@@ -14,9 +14,9 @@
#include "mojo/public/cpp/application/application_impl.h"
#include "mojo/public/cpp/application/connect.h"
#include "mojo/services/nfc/interfaces/nfc.mojom.h"
-#include "mojo/services/view_manager/public/cpp/view_manager_client_factory.h"
-#include "mojo/services/view_manager/public/cpp/view_manager_delegate.h"
-#include "mojo/services/view_manager/public/cpp/view_observer.h"
+#include "mojo/services/view_manager/cpp/view_manager_client_factory.h"
+#include "mojo/services/view_manager/cpp/view_manager_delegate.h"
+#include "mojo/services/view_manager/cpp/view_observer.h"
#include "mojo/skia/ganesh_context.h"
#include "mojo/skia/ganesh_surface.h"
#include "third_party/skia/include/core/SkCanvas.h"
diff --git a/examples/pdf_viewer/BUILD.gn b/examples/pdf_viewer/BUILD.gn
index e9dcc01..fc3dd2c 100644
--- a/examples/pdf_viewer/BUILD.gn
+++ b/examples/pdf_viewer/BUILD.gn
@@ -19,7 +19,7 @@
"//mojo/services/content_handler/interfaces",
"//mojo/services/input_events/interfaces",
"//mojo/services/network/public/interfaces",
- "//mojo/services/view_manager/public/cpp",
+ "//mojo/services/view_manager/cpp",
"//third_party/pdfium",
]
}
diff --git a/examples/pdf_viewer/pdf_viewer.cc b/examples/pdf_viewer/pdf_viewer.cc
index 3869266..57370d0 100644
--- a/examples/pdf_viewer/pdf_viewer.cc
+++ b/examples/pdf_viewer/pdf_viewer.cc
@@ -17,12 +17,12 @@
#include "mojo/services/content_handler/interfaces/content_handler.mojom.h"
#include "mojo/services/input_events/interfaces/input_events.mojom.h"
#include "mojo/services/input_events/interfaces/input_key_codes.mojom.h"
-#include "mojo/services/view_manager/public/cpp/types.h"
-#include "mojo/services/view_manager/public/cpp/view.h"
-#include "mojo/services/view_manager/public/cpp/view_manager.h"
-#include "mojo/services/view_manager/public/cpp/view_manager_client_factory.h"
-#include "mojo/services/view_manager/public/cpp/view_manager_delegate.h"
-#include "mojo/services/view_manager/public/cpp/view_observer.h"
+#include "mojo/services/view_manager/cpp/types.h"
+#include "mojo/services/view_manager/cpp/view.h"
+#include "mojo/services/view_manager/cpp/view_manager.h"
+#include "mojo/services/view_manager/cpp/view_manager_client_factory.h"
+#include "mojo/services/view_manager/cpp/view_manager_delegate.h"
+#include "mojo/services/view_manager/cpp/view_observer.h"
#include "third_party/pdfium/fpdfsdk/include/fpdf_ext.h"
#include "third_party/pdfium/fpdfsdk/include/fpdfview.h"
#include "v8/include/v8.h"
diff --git a/examples/png_viewer/BUILD.gn b/examples/png_viewer/BUILD.gn
index ee18e5a..39b505b 100644
--- a/examples/png_viewer/BUILD.gn
+++ b/examples/png_viewer/BUILD.gn
@@ -18,7 +18,7 @@
"//mojo/public/cpp/utility",
"//mojo/services/content_handler/interfaces",
"//mojo/services/network/public/interfaces",
- "//mojo/services/view_manager/public/cpp",
+ "//mojo/services/view_manager/cpp",
"//ui/gfx",
]
}
diff --git a/examples/png_viewer/png_viewer.cc b/examples/png_viewer/png_viewer.cc
index a5f0c2e..47b31a0 100644
--- a/examples/png_viewer/png_viewer.cc
+++ b/examples/png_viewer/png_viewer.cc
@@ -19,12 +19,12 @@
#include "mojo/public/cpp/application/interface_factory_impl.h"
#include "mojo/public/cpp/application/service_provider_impl.h"
#include "mojo/services/content_handler/interfaces/content_handler.mojom.h"
-#include "mojo/services/view_manager/public/cpp/types.h"
-#include "mojo/services/view_manager/public/cpp/view.h"
-#include "mojo/services/view_manager/public/cpp/view_manager.h"
-#include "mojo/services/view_manager/public/cpp/view_manager_client_factory.h"
-#include "mojo/services/view_manager/public/cpp/view_manager_delegate.h"
-#include "mojo/services/view_manager/public/cpp/view_observer.h"
+#include "mojo/services/view_manager/cpp/types.h"
+#include "mojo/services/view_manager/cpp/view.h"
+#include "mojo/services/view_manager/cpp/view_manager.h"
+#include "mojo/services/view_manager/cpp/view_manager_client_factory.h"
+#include "mojo/services/view_manager/cpp/view_manager_delegate.h"
+#include "mojo/services/view_manager/cpp/view_observer.h"
#include "third_party/skia/include/core/SkColor.h"
#include "ui/gfx/codec/png_codec.h"
diff --git a/examples/window_manager/BUILD.gn b/examples/window_manager/BUILD.gn
index a093f25..252c934 100644
--- a/examples/window_manager/BUILD.gn
+++ b/examples/window_manager/BUILD.gn
@@ -25,7 +25,7 @@
"//mojo/services/geometry/interfaces",
"//mojo/services/input_events/interfaces",
"//mojo/services/navigation/interfaces",
- "//mojo/services/view_manager/public/cpp",
+ "//mojo/services/view_manager/cpp",
"//services/window_manager:lib",
"//ui/events:events",
"//url:url",
diff --git a/examples/window_manager/window_manager.cc b/examples/window_manager/window_manager.cc
index 2d1564c..1fbd491 100644
--- a/examples/window_manager/window_manager.cc
+++ b/examples/window_manager/window_manager.cc
@@ -18,10 +18,10 @@
#include "mojo/public/cpp/bindings/strong_binding.h"
#include "mojo/services/input_events/interfaces/input_events.mojom.h"
#include "mojo/services/navigation/interfaces/navigation.mojom.h"
-#include "mojo/services/view_manager/public/cpp/view.h"
-#include "mojo/services/view_manager/public/cpp/view_manager.h"
-#include "mojo/services/view_manager/public/cpp/view_manager_delegate.h"
-#include "mojo/services/view_manager/public/cpp/view_observer.h"
+#include "mojo/services/view_manager/cpp/view.h"
+#include "mojo/services/view_manager/cpp/view_manager.h"
+#include "mojo/services/view_manager/cpp/view_manager_delegate.h"
+#include "mojo/services/view_manager/cpp/view_observer.h"
#include "services/window_manager/basic_focus_rules.h"
#include "services/window_manager/view_target.h"
#include "services/window_manager/window_manager_app.h"
diff --git a/examples/wm_flow/BUILD.gn b/examples/wm_flow/BUILD.gn
index 823b5c9..d2dab6f 100644
--- a/examples/wm_flow/BUILD.gn
+++ b/examples/wm_flow/BUILD.gn
@@ -30,7 +30,7 @@
"//mojo/converters/geometry",
"//mojo/public/interfaces/application",
"//mojo/services/input_events/interfaces",
- "//mojo/services/view_manager/public/cpp",
+ "//mojo/services/view_manager/cpp",
"//services/window_manager:lib",
"//skia",
"//ui/gfx/geometry",
@@ -53,7 +53,7 @@
"//mojo/application",
"//mojo/common",
"//mojo/public/interfaces/application:application",
- "//mojo/services/view_manager/public/cpp",
+ "//mojo/services/view_manager/cpp",
"//services/window_manager:lib",
"//skia",
"//url",
@@ -73,7 +73,7 @@
"//base",
"//examples/bitmap_uploader",
"//mojo/application",
- "//mojo/services/view_manager/public/cpp",
+ "//mojo/services/view_manager/cpp",
"//services/window_manager:lib",
"//skia",
"//url",
diff --git a/examples/wm_flow/app/app.cc b/examples/wm_flow/app/app.cc
index 691523d..163bd1a 100644
--- a/examples/wm_flow/app/app.cc
+++ b/examples/wm_flow/app/app.cc
@@ -21,12 +21,12 @@
#include "mojo/public/cpp/application/service_provider_impl.h"
#include "mojo/public/cpp/bindings/strong_binding.h"
#include "mojo/public/interfaces/application/service_provider.mojom.h"
-#include "mojo/services/view_manager/public/cpp/view.h"
-#include "mojo/services/view_manager/public/cpp/view_manager.h"
-#include "mojo/services/view_manager/public/cpp/view_manager_client_factory.h"
-#include "mojo/services/view_manager/public/cpp/view_manager_context.h"
-#include "mojo/services/view_manager/public/cpp/view_manager_delegate.h"
-#include "mojo/services/view_manager/public/cpp/view_observer.h"
+#include "mojo/services/view_manager/cpp/view.h"
+#include "mojo/services/view_manager/cpp/view_manager.h"
+#include "mojo/services/view_manager/cpp/view_manager_client_factory.h"
+#include "mojo/services/view_manager/cpp/view_manager_context.h"
+#include "mojo/services/view_manager/cpp/view_manager_delegate.h"
+#include "mojo/services/view_manager/cpp/view_observer.h"
#include "third_party/skia/include/core/SkColor.h"
#include "url/gurl.h"
diff --git a/examples/wm_flow/embedded/embedded.cc b/examples/wm_flow/embedded/embedded.cc
index e02f466..f7c67f8 100644
--- a/examples/wm_flow/embedded/embedded.cc
+++ b/examples/wm_flow/embedded/embedded.cc
@@ -15,10 +15,10 @@
#include "mojo/public/cpp/application/connect.h"
#include "mojo/public/cpp/application/service_provider_impl.h"
#include "mojo/public/cpp/bindings/strong_binding.h"
-#include "mojo/services/view_manager/public/cpp/view.h"
-#include "mojo/services/view_manager/public/cpp/view_manager.h"
-#include "mojo/services/view_manager/public/cpp/view_manager_client_factory.h"
-#include "mojo/services/view_manager/public/cpp/view_manager_delegate.h"
+#include "mojo/services/view_manager/cpp/view.h"
+#include "mojo/services/view_manager/cpp/view_manager.h"
+#include "mojo/services/view_manager/cpp/view_manager_client_factory.h"
+#include "mojo/services/view_manager/cpp/view_manager_delegate.h"
#include "third_party/skia/include/core/SkColor.h"
namespace examples {
diff --git a/examples/wm_flow/wm/frame_controller.cc b/examples/wm_flow/wm/frame_controller.cc
index 21f9281..c3ec629 100644
--- a/examples/wm_flow/wm/frame_controller.cc
+++ b/examples/wm_flow/wm/frame_controller.cc
@@ -8,8 +8,8 @@
#include "base/strings/utf_string_conversions.h"
#include "mojo/converters/geometry/geometry_type_converters.h"
#include "mojo/public/interfaces/application/service_provider.mojom.h"
-#include "mojo/services/view_manager/public/cpp/view.h"
-#include "mojo/services/view_manager/public/cpp/view_manager.h"
+#include "mojo/services/view_manager/cpp/view.h"
+#include "mojo/services/view_manager/cpp/view_manager.h"
#include "services/window_manager/capture_controller.h"
#include "services/window_manager/window_manager_root.h"
#include "url/gurl.h"
diff --git a/examples/wm_flow/wm/frame_controller.h b/examples/wm_flow/wm/frame_controller.h
index e94d0cf..5472459 100644
--- a/examples/wm_flow/wm/frame_controller.h
+++ b/examples/wm_flow/wm/frame_controller.h
@@ -9,7 +9,7 @@
#include "examples/wm_flow/wm/window_frame_host.mojom.h"
#include "mojo/public/cpp/application/interface_factory.h"
#include "mojo/public/cpp/application/service_provider_impl.h"
-#include "mojo/services/view_manager/public/cpp/view_observer.h"
+#include "mojo/services/view_manager/cpp/view_observer.h"
#include "services/window_manager/focus_controller.h"
#include "ui/gfx/geometry/rect.h"
diff --git a/examples/wm_flow/wm/wm.cc b/examples/wm_flow/wm/wm.cc
index 5b11f58..f5b4286 100644
--- a/examples/wm_flow/wm/wm.cc
+++ b/examples/wm_flow/wm/wm.cc
@@ -9,9 +9,9 @@
#include "mojo/public/cpp/application/application_impl.h"
#include "mojo/public/cpp/application/service_provider_impl.h"
#include "mojo/services/input_events/interfaces/input_events.mojom.h"
-#include "mojo/services/view_manager/public/cpp/view_manager.h"
-#include "mojo/services/view_manager/public/cpp/view_manager_delegate.h"
-#include "mojo/services/view_manager/public/cpp/view_observer.h"
+#include "mojo/services/view_manager/cpp/view_manager.h"
+#include "mojo/services/view_manager/cpp/view_manager_delegate.h"
+#include "mojo/services/view_manager/cpp/view_observer.h"
#include "services/window_manager/basic_focus_rules.h"
#include "services/window_manager/window_manager_app.h"
#include "services/window_manager/window_manager_delegate.h"
diff --git a/mojo/BUILD.gn b/mojo/BUILD.gn
index 50a4d33..e304fba 100644
--- a/mojo/BUILD.gn
+++ b/mojo/BUILD.gn
@@ -62,7 +62,7 @@
"//mojo/edk/test:public_tests",
"//mojo/dart/embedder/test:dart_unittests",
"//mojo/public/cpp/bindings/tests:versioning_apptests",
- "//mojo/services/view_manager/public/cpp/tests:mojo_view_manager_lib_unittests",
+ "//mojo/services/view_manager/cpp/tests:mojo_view_manager_lib_unittests",
"//mojo/tests:mojo_task_tracker_perftests",
"//mojo/tools:message_generator",
"//mojo/gles2:mgl_unittests",
diff --git a/mojo/services/mojo_services.gni b/mojo/services/mojo_services.gni
index 154580b..113d0a6 100644
--- a/mojo/services/mojo_services.gni
+++ b/mojo/services/mojo_services.gni
@@ -41,7 +41,7 @@
"//mojo/services/terminal/interfaces",
"//mojo/services/tracing/interfaces",
"//mojo/services/url_response_disk_cache/interfaces",
- "//mojo/services/vanadium/security/public/interfaces",
- "//mojo/services/view_manager/public/interfaces",
- "//mojo/services/window_manager/public/interfaces",
+ "//mojo/services/vanadium/security/interfaces",
+ "//mojo/services/view_manager/interfaces",
+ "//mojo/services/window_manager/interfaces",
]
diff --git a/mojo/services/vanadium/security/public/interfaces/BUILD.gn b/mojo/services/vanadium/security/interfaces/BUILD.gn
similarity index 100%
rename from mojo/services/vanadium/security/public/interfaces/BUILD.gn
rename to mojo/services/vanadium/security/interfaces/BUILD.gn
diff --git a/mojo/services/vanadium/security/public/interfaces/principal.mojom b/mojo/services/vanadium/security/interfaces/principal.mojom
similarity index 100%
rename from mojo/services/vanadium/security/public/interfaces/principal.mojom
rename to mojo/services/vanadium/security/interfaces/principal.mojom
diff --git a/mojo/services/view_manager/public/cpp/BUILD.gn b/mojo/services/view_manager/cpp/BUILD.gn
similarity index 79%
rename from mojo/services/view_manager/public/cpp/BUILD.gn
rename to mojo/services/view_manager/cpp/BUILD.gn
index e352d41..156c437 100644
--- a/mojo/services/view_manager/public/cpp/BUILD.gn
+++ b/mojo/services/view_manager/cpp/BUILD.gn
@@ -7,7 +7,7 @@
mojo_sdk_source_set("cpp") {
restrict_external_deps = false
- public_configs = [ "../../../public/build/config:mojo_services" ]
+ public_configs = [ "../../public/build/config:mojo_services" ]
sources = [
"lib/view.cc",
"lib/view_manager_client_factory.cc",
@@ -35,10 +35,10 @@
deps = [
"../interfaces",
- "../../../geometry/interfaces",
- "../../../input_events/interfaces",
- "../../../surfaces/interfaces:surface_id",
- "../../../window_manager/public/interfaces",
+ "../../geometry/interfaces",
+ "../../input_events/interfaces",
+ "../../surfaces/interfaces:surface_id",
+ "../../window_manager/interfaces",
"//base",
]
@@ -51,7 +51,7 @@
}
source_set("common") {
- configs += [ "../../../public/build/config:mojo_services" ]
+ configs += [ "../../public/build/config:mojo_services" ]
sources = [
"keys.cc",
diff --git a/mojo/services/view_manager/public/cpp/keys.cc b/mojo/services/view_manager/cpp/keys.cc
similarity index 87%
rename from mojo/services/view_manager/public/cpp/keys.cc
rename to mojo/services/view_manager/cpp/keys.cc
index 5ed54ef..b9a5d94 100644
--- a/mojo/services/view_manager/public/cpp/keys.cc
+++ b/mojo/services/view_manager/cpp/keys.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "view_manager/public/cpp/keys.h"
+#include "view_manager/cpp/keys.h"
namespace mojo {
diff --git a/mojo/services/view_manager/public/cpp/keys.h b/mojo/services/view_manager/cpp/keys.h
similarity index 61%
rename from mojo/services/view_manager/public/cpp/keys.h
rename to mojo/services/view_manager/cpp/keys.h
index 77ca346..890657f 100644
--- a/mojo/services/view_manager/public/cpp/keys.h
+++ b/mojo/services/view_manager/cpp/keys.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_KEYS_H_
-#define MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_KEYS_H_
+#ifndef MOJO_SERVICES_VIEW_MANAGER_CPP_KEYS_H_
+#define MOJO_SERVICES_VIEW_MANAGER_CPP_KEYS_H_
namespace mojo {
@@ -11,4 +11,4 @@
} // namespace mojo
-#endif // MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_KEYS_H_
+#endif // MOJO_SERVICES_VIEW_MANAGER_CPP_KEYS_H_
diff --git a/mojo/services/view_manager/public/cpp/lib/view.cc b/mojo/services/view_manager/cpp/lib/view.cc
similarity index 87%
rename from mojo/services/view_manager/public/cpp/lib/view.cc
rename to mojo/services/view_manager/cpp/lib/view.cc
index 5b11fe4..a42fa12 100644
--- a/mojo/services/view_manager/public/cpp/lib/view.cc
+++ b/mojo/services/view_manager/cpp/lib/view.cc
@@ -2,16 +2,16 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "view_manager/public/cpp/view.h"
+#include "view_manager/cpp/view.h"
#include <set>
#include <string>
#include "mojo/public/cpp/application/service_provider_impl.h"
-#include "view_manager/public/cpp/lib/view_manager_client_impl.h"
-#include "view_manager/public/cpp/lib/view_private.h"
-#include "view_manager/public/cpp/view_observer.h"
-#include "view_manager/public/cpp/view_tracker.h"
+#include "view_manager/cpp/lib/view_manager_client_impl.h"
+#include "view_manager/cpp/lib/view_private.h"
+#include "view_manager/cpp/view_observer.h"
+#include "view_manager/cpp/view_tracker.h"
namespace mojo {
@@ -24,37 +24,32 @@
ViewObserver::TreeChangeParams local_params = params;
local_params.receiver = receiver;
if (change_applied) {
- FOR_EACH_OBSERVER(ViewObserver,
- *ViewPrivate(receiver).observers(),
+ FOR_EACH_OBSERVER(ViewObserver, *ViewPrivate(receiver).observers(),
OnTreeChanged(local_params));
} else {
- FOR_EACH_OBSERVER(ViewObserver,
- *ViewPrivate(receiver).observers(),
+ FOR_EACH_OBSERVER(ViewObserver, *ViewPrivate(receiver).observers(),
OnTreeChanging(local_params));
}
}
-void NotifyViewTreeChangeUp(
- View* start_at,
- const ViewObserver::TreeChangeParams& params,
- bool change_applied) {
+void NotifyViewTreeChangeUp(View* start_at,
+ const ViewObserver::TreeChangeParams& params,
+ bool change_applied) {
for (View* current = start_at; current; current = current->parent())
NotifyViewTreeChangeAtReceiver(current, params, change_applied);
}
-void NotifyViewTreeChangeDown(
- View* start_at,
- const ViewObserver::TreeChangeParams& params,
- bool change_applied) {
+void NotifyViewTreeChangeDown(View* start_at,
+ const ViewObserver::TreeChangeParams& params,
+ bool change_applied) {
NotifyViewTreeChangeAtReceiver(start_at, params, change_applied);
View::Children::const_iterator it = start_at->children().begin();
for (; it != start_at->children().end(); ++it)
NotifyViewTreeChangeDown(*it, params, change_applied);
}
-void NotifyViewTreeChange(
- const ViewObserver::TreeChangeParams& params,
- bool change_applied) {
+void NotifyViewTreeChange(const ViewObserver::TreeChangeParams& params,
+ bool change_applied) {
NotifyViewTreeChangeDown(params.target, params, change_applied);
if (params.old_parent)
NotifyViewTreeChangeUp(params.old_parent, params, change_applied);
@@ -70,9 +65,7 @@
params_.new_parent = new_parent;
NotifyViewTreeChange(params_, false);
}
- ~ScopedTreeNotifier() {
- NotifyViewTreeChange(params_, true);
- }
+ ~ScopedTreeNotifier() { NotifyViewTreeChange(params_, true); }
private:
ViewObserver::TreeChangeParams params_;
@@ -94,16 +87,12 @@
ScopedOrderChangedNotifier(View* view,
View* relative_view,
OrderDirection direction)
- : view_(view),
- relative_view_(relative_view),
- direction_(direction) {
- FOR_EACH_OBSERVER(ViewObserver,
- *ViewPrivate(view_).observers(),
+ : view_(view), relative_view_(relative_view), direction_(direction) {
+ FOR_EACH_OBSERVER(ViewObserver, *ViewPrivate(view_).observers(),
OnViewReordering(view_, relative_view_, direction_));
}
~ScopedOrderChangedNotifier() {
- FOR_EACH_OBSERVER(ViewObserver,
- *ViewPrivate(view_).observers(),
+ FOR_EACH_OBSERVER(ViewObserver, *ViewPrivate(view_).observers(),
OnViewReordered(view_, relative_view_, direction_));
}
@@ -150,16 +139,12 @@
ScopedSetBoundsNotifier(View* view,
const Rect& old_bounds,
const Rect& new_bounds)
- : view_(view),
- old_bounds_(old_bounds),
- new_bounds_(new_bounds) {
- FOR_EACH_OBSERVER(ViewObserver,
- *ViewPrivate(view_).observers(),
+ : view_(view), old_bounds_(old_bounds), new_bounds_(new_bounds) {
+ FOR_EACH_OBSERVER(ViewObserver, *ViewPrivate(view_).observers(),
OnViewBoundsChanging(view_, old_bounds_, new_bounds_));
}
~ScopedSetBoundsNotifier() {
- FOR_EACH_OBSERVER(ViewObserver,
- *ViewPrivate(view_).observers(),
+ FOR_EACH_OBSERVER(ViewObserver, *ViewPrivate(view_).observers(),
OnViewBoundsChanged(view_, old_bounds_, new_bounds_));
}
@@ -174,7 +159,7 @@
// Some operations are only permitted in the connection that created the view.
bool OwnsView(ViewManager* manager, View* view) {
return !manager ||
- static_cast<ViewManagerClientImpl*>(manager)->OwnsView(view->id());
+ static_cast<ViewManagerClientImpl*>(manager)->OwnsView(view->id());
}
} // namespace
@@ -254,8 +239,8 @@
if (value->size())
memcpy(&transport_value.front(), &(value->front()), value->size());
}
- static_cast<ViewManagerClientImpl*>(manager_)->SetProperty(
- id_, name, transport_value.Pass());
+ static_cast<ViewManagerClientImpl*>(manager_)
+ ->SetProperty(id_, name, transport_value.Pass());
}
FOR_EACH_OBSERVER(
@@ -301,8 +286,8 @@
CHECK_EQ(child->view_manager(), manager_);
LocalRemoveChild(child);
if (manager_) {
- static_cast<ViewManagerClientImpl*>(manager_)->RemoveChild(child->id(),
- id_);
+ static_cast<ViewManagerClientImpl*>(manager_)
+ ->RemoveChild(child->id(), id_);
}
}
@@ -322,9 +307,8 @@
if (!LocalReorder(relative, direction))
return;
if (manager_) {
- static_cast<ViewManagerClientImpl*>(manager_)->Reorder(id_,
- relative->id(),
- direction);
+ static_cast<ViewManagerClientImpl*>(manager_)
+ ->Reorder(id_, relative->id(), direction);
}
}
@@ -406,8 +390,7 @@
parent_(NULL),
viewport_metrics_(CreateEmptyViewportMetrics()),
visible_(true),
- drawn_(false) {
-}
+ drawn_(false) {}
View::~View() {
FOR_EACH_OBSERVER(ViewObserver, observers_, OnViewDestroying(this));
@@ -446,8 +429,7 @@
parent_(nullptr),
viewport_metrics_(CreateEmptyViewportMetrics()),
visible_(false),
- drawn_(false) {
-}
+ drawn_(false) {}
int64 View::SetLocalPropertyInternal(const void* key,
const char* name,
@@ -499,8 +481,7 @@
return ReorderImpl(&parent_->children_, this, relative, direction);
}
-void View::LocalSetBounds(const Rect& old_bounds,
- const Rect& new_bounds) {
+void View::LocalSetBounds(const Rect& old_bounds, const Rect& new_bounds) {
DCHECK(old_bounds.x == bounds_.x);
DCHECK(old_bounds.y == bounds_.y);
DCHECK(old_bounds.width == bounds_.width);
@@ -544,7 +525,7 @@
void View::NotifyViewVisibilityChanged(View* target) {
if (!NotifyViewVisibilityChangedDown(target)) {
- return; // |this| has been deleted.
+ return; // |this| has been deleted.
}
NotifyViewVisibilityChangedUp(target);
}
@@ -561,7 +542,7 @@
bool View::NotifyViewVisibilityChangedDown(View* target) {
if (!NotifyViewVisibilityChangedAtReceiver(target))
- return false; // |this| was deleted.
+ return false; // |this| was deleted.
std::set<const View*> child_already_processed;
bool child_destroyed = false;
do {
diff --git a/mojo/services/view_manager/public/cpp/lib/view_manager_client_factory.cc b/mojo/services/view_manager/cpp/lib/view_manager_client_factory.cc
similarity index 83%
rename from mojo/services/view_manager/public/cpp/lib/view_manager_client_factory.cc
rename to mojo/services/view_manager/cpp/lib/view_manager_client_factory.cc
index bb39fc9..73a06a1 100644
--- a/mojo/services/view_manager/public/cpp/lib/view_manager_client_factory.cc
+++ b/mojo/services/view_manager/cpp/lib/view_manager_client_factory.cc
@@ -2,21 +2,19 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "view_manager/public/cpp/view_manager_client_factory.h"
+#include "view_manager/cpp/view_manager_client_factory.h"
#include "mojo/public/interfaces/application/shell.mojom.h"
-#include "view_manager/public/cpp/lib/view_manager_client_impl.h"
+#include "view_manager/cpp/lib/view_manager_client_impl.h"
namespace mojo {
ViewManagerClientFactory::ViewManagerClientFactory(
Shell* shell,
ViewManagerDelegate* delegate)
- : shell_(shell), delegate_(delegate) {
-}
+ : shell_(shell), delegate_(delegate) {}
-ViewManagerClientFactory::~ViewManagerClientFactory() {
-}
+ViewManagerClientFactory::~ViewManagerClientFactory() {}
// static
ViewManagerClient* ViewManagerClientFactory::WeakBindViewManagerToPipe(
diff --git a/mojo/services/view_manager/public/cpp/lib/view_manager_client_impl.cc b/mojo/services/view_manager/cpp/lib/view_manager_client_impl.cc
similarity index 90%
rename from mojo/services/view_manager/public/cpp/lib/view_manager_client_impl.cc
rename to mojo/services/view_manager/cpp/lib/view_manager_client_impl.cc
index b8262d1..6852f66 100644
--- a/mojo/services/view_manager/public/cpp/lib/view_manager_client_impl.cc
+++ b/mojo/services/view_manager/cpp/lib/view_manager_client_impl.cc
@@ -2,17 +2,17 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "view_manager/public/cpp/lib/view_manager_client_impl.h"
+#include "view_manager/cpp/lib/view_manager_client_impl.h"
#include "mojo/public/cpp/application/application_impl.h"
#include "mojo/public/cpp/application/connect.h"
#include "mojo/public/cpp/application/service_provider_impl.h"
#include "mojo/public/interfaces/application/service_provider.mojom.h"
#include "mojo/public/interfaces/application/shell.mojom.h"
-#include "view_manager/public/cpp/lib/view_private.h"
-#include "view_manager/public/cpp/util.h"
-#include "view_manager/public/cpp/view_manager_delegate.h"
-#include "view_manager/public/cpp/view_observer.h"
+#include "view_manager/cpp/lib/view_private.h"
+#include "view_manager/cpp/util.h"
+#include "view_manager/cpp/view_manager_delegate.h"
+#include "view_manager/cpp/view_observer.h"
namespace mojo {
@@ -144,10 +144,9 @@
service_->RemoveViewFromParent(child_id, ActionCompletedCallback());
}
-void ViewManagerClientImpl::Reorder(
- Id view_id,
- Id relative_view_id,
- OrderDirection direction) {
+void ViewManagerClientImpl::Reorder(Id view_id,
+ Id relative_view_id,
+ OrderDirection direction) {
DCHECK(service_);
service_->ReorderView(view_id, relative_view_id, direction,
ActionCompletedCallback());
@@ -166,8 +165,8 @@
DCHECK(service_);
if (surface_id.is_null())
return;
- service_->SetViewSurfaceId(
- view_id, surface_id.Pass(), ActionCompletedCallback());
+ service_->SetViewSurfaceId(view_id, surface_id.Pass(),
+ ActionCompletedCallback());
}
void ViewManagerClientImpl::SetFocus(Id view_id) {
@@ -182,14 +181,11 @@
service_->SetViewVisibility(view_id, visible, ActionCompletedCallback());
}
-void ViewManagerClientImpl::SetProperty(
- Id view_id,
- const std::string& name,
- const std::vector<uint8_t>& data) {
+void ViewManagerClientImpl::SetProperty(Id view_id,
+ const std::string& name,
+ const std::vector<uint8_t>& data) {
DCHECK(service_);
- service_->SetViewProperty(view_id,
- String(name),
- Array<uint8_t>::From(data),
+ service_->SetViewProperty(view_id, String(name), Array<uint8_t>::From(data),
ActionCompletedCallback());
}
@@ -353,8 +349,7 @@
Id new_parent_id,
Id old_parent_id,
mojo::Array<ViewDataPtr> views) {
- View* initial_parent = views.size() ?
- GetViewById(views[0]->parent_id) : NULL;
+ View* initial_parent = views.size() ? GetViewById(views[0]->parent_id) : NULL;
BuildViewTree(this, views, initial_parent);
@@ -420,8 +415,7 @@
const Callback<void()>& ack_callback) {
View* view = GetViewById(view_id);
if (view) {
- FOR_EACH_OBSERVER(ViewObserver,
- *ViewPrivate(view).observers(),
+ FOR_EACH_OBSERVER(ViewObserver, *ViewPrivate(view).observers(),
OnViewInputEvent(view, event));
}
ack_callback.Run();
@@ -442,14 +436,12 @@
View* gained_capture = GetViewById(capture_view_id);
View* lost_capture = capture_view_;
if (lost_capture) {
- FOR_EACH_OBSERVER(ViewObserver,
- *ViewPrivate(lost_capture).observers(),
+ FOR_EACH_OBSERVER(ViewObserver, *ViewPrivate(lost_capture).observers(),
OnViewFocusChanged(gained_capture, lost_capture));
}
capture_view_ = gained_capture;
if (gained_capture) {
- FOR_EACH_OBSERVER(ViewObserver,
- *ViewPrivate(gained_capture).observers(),
+ FOR_EACH_OBSERVER(ViewObserver, *ViewPrivate(gained_capture).observers(),
OnViewFocusChanged(gained_capture, lost_capture));
}
}
@@ -458,14 +450,12 @@
View* focused = GetViewById(focused_view_id);
View* blurred = focused_view_;
if (blurred) {
- FOR_EACH_OBSERVER(ViewObserver,
- *ViewPrivate(blurred).observers(),
+ FOR_EACH_OBSERVER(ViewObserver, *ViewPrivate(blurred).observers(),
OnViewFocusChanged(focused, blurred));
}
focused_view_ = focused;
if (focused) {
- FOR_EACH_OBSERVER(ViewObserver,
- *ViewPrivate(focused).observers(),
+ FOR_EACH_OBSERVER(ViewObserver, *ViewPrivate(focused).observers(),
OnViewFocusChanged(focused, blurred));
}
}
@@ -474,14 +464,12 @@
View* activated = GetViewById(active_view_id);
View* deactivated = activated_view_;
if (deactivated) {
- FOR_EACH_OBSERVER(ViewObserver,
- *ViewPrivate(deactivated).observers(),
+ FOR_EACH_OBSERVER(ViewObserver, *ViewPrivate(deactivated).observers(),
OnViewActivationChanged(activated, deactivated));
}
activated_view_ = activated;
if (activated) {
- FOR_EACH_OBSERVER(ViewObserver,
- *ViewPrivate(activated).observers(),
+ FOR_EACH_OBSERVER(ViewObserver, *ViewPrivate(activated).observers(),
OnViewActivationChanged(activated, deactivated));
}
}
diff --git a/mojo/services/view_manager/public/cpp/lib/view_manager_client_impl.h b/mojo/services/view_manager/cpp/lib/view_manager_client_impl.h
similarity index 91%
rename from mojo/services/view_manager/public/cpp/lib/view_manager_client_impl.h
rename to mojo/services/view_manager/cpp/lib/view_manager_client_impl.h
index 55e6be8..347895a 100644
--- a/mojo/services/view_manager/public/cpp/lib/view_manager_client_impl.h
+++ b/mojo/services/view_manager/cpp/lib/view_manager_client_impl.h
@@ -2,15 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_LIB_VIEW_MANAGER_CLIENT_IMPL_H_
-#define MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_LIB_VIEW_MANAGER_CLIENT_IMPL_H_
+#ifndef MOJO_SERVICES_VIEW_MANAGER_CPP_LIB_VIEW_MANAGER_CLIENT_IMPL_H_
+#define MOJO_SERVICES_VIEW_MANAGER_CPP_LIB_VIEW_MANAGER_CLIENT_IMPL_H_
#include "mojo/public/cpp/bindings/binding.h"
-#include "view_manager/public/cpp/types.h"
-#include "view_manager/public/cpp/view.h"
-#include "view_manager/public/cpp/view_manager.h"
-#include "view_manager/public/interfaces/view_manager.mojom.h"
-#include "window_manager/public/interfaces/window_manager.mojom.h"
+#include "view_manager/cpp/types.h"
+#include "view_manager/cpp/view.h"
+#include "view_manager/cpp/view_manager.h"
+#include "view_manager/interfaces/view_manager.mojom.h"
+#include "window_manager/interfaces/window_manager.mojom.h"
namespace mojo {
class Shell;
@@ -161,4 +161,4 @@
} // namespace mojo
-#endif // MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_LIB_VIEW_MANAGER_CLIENT_IMPL_H_
+#endif // MOJO_SERVICES_VIEW_MANAGER_CPP_LIB_VIEW_MANAGER_CLIENT_IMPL_H_
diff --git a/mojo/services/view_manager/public/cpp/lib/view_manager_context.cc b/mojo/services/view_manager/cpp/lib/view_manager_context.cc
similarity index 90%
rename from mojo/services/view_manager/public/cpp/lib/view_manager_context.cc
rename to mojo/services/view_manager/cpp/lib/view_manager_context.cc
index d1c2fd0..adef60a 100644
--- a/mojo/services/view_manager/public/cpp/lib/view_manager_context.cc
+++ b/mojo/services/view_manager/cpp/lib/view_manager_context.cc
@@ -2,11 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "view_manager/public/cpp/view_manager_context.h"
+#include "view_manager/cpp/view_manager_context.h"
#include "mojo/public/cpp/application/application_impl.h"
#include "mojo/public/cpp/bindings/interface_request.h"
-#include "window_manager/public/interfaces/window_manager.mojom.h"
+#include "window_manager/interfaces/window_manager.mojom.h"
namespace mojo {
class ApplicationImpl;
diff --git a/mojo/services/view_manager/public/cpp/lib/view_observer.cc b/mojo/services/view_manager/cpp/lib/view_observer.cc
similarity index 84%
rename from mojo/services/view_manager/public/cpp/lib/view_observer.cc
rename to mojo/services/view_manager/cpp/lib/view_observer.cc
index 7e6acc0..a72b514 100644
--- a/mojo/services/view_manager/public/cpp/lib/view_observer.cc
+++ b/mojo/services/view_manager/cpp/lib/view_observer.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "view_manager/public/cpp/view_observer.h"
+#include "view_manager/cpp/view_observer.h"
namespace mojo {
@@ -13,7 +13,6 @@
: target(nullptr),
old_parent(nullptr),
new_parent(nullptr),
- receiver(nullptr) {
-}
+ receiver(nullptr) {}
} // namespace mojo
diff --git a/mojo/services/view_manager/public/cpp/lib/view_private.cc b/mojo/services/view_manager/cpp/lib/view_private.cc
similarity index 67%
rename from mojo/services/view_manager/public/cpp/lib/view_private.cc
rename to mojo/services/view_manager/cpp/lib/view_private.cc
index 20232e8..3f9d25c 100644
--- a/mojo/services/view_manager/public/cpp/lib/view_private.cc
+++ b/mojo/services/view_manager/cpp/lib/view_private.cc
@@ -2,17 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "view_manager/public/cpp/lib/view_private.h"
+#include "view_manager/cpp/lib/view_private.h"
namespace mojo {
-ViewPrivate::ViewPrivate(View* view)
- : view_(view) {
+ViewPrivate::ViewPrivate(View* view) : view_(view) {
CHECK(view);
}
-ViewPrivate::~ViewPrivate() {
-}
+ViewPrivate::~ViewPrivate() {}
// static
View* ViewPrivate::LocalCreate() {
diff --git a/mojo/services/view_manager/public/cpp/lib/view_private.h b/mojo/services/view_manager/cpp/lib/view_private.h
similarity index 70%
rename from mojo/services/view_manager/public/cpp/lib/view_private.h
rename to mojo/services/view_manager/cpp/lib/view_private.h
index 1d149a5..731c678 100644
--- a/mojo/services/view_manager/public/cpp/lib/view_private.h
+++ b/mojo/services/view_manager/cpp/lib/view_private.h
@@ -2,10 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_LIB_VIEW_PRIVATE_H_
-#define MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_LIB_VIEW_PRIVATE_H_
+#ifndef MOJO_SERVICES_VIEW_MANAGER_CPP_LIB_VIEW_PRIVATE_H_
+#define MOJO_SERVICES_VIEW_MANAGER_CPP_LIB_VIEW_PRIVATE_H_
-#include "view_manager/public/cpp/view.h"
+#include "view_manager/cpp/view.h"
namespace mojo {
@@ -29,9 +29,7 @@
void set_id(Id id) { view_->id_ = id; }
- void set_view_manager(ViewManager* manager) {
- view_->manager_ = manager;
- }
+ void set_view_manager(ViewManager* manager) { view_->manager_ = manager; }
void set_properties(const std::map<std::string, std::vector<uint8_t>>& data) {
view_->properties_ = data;
@@ -42,20 +40,13 @@
view_->LocalSetViewportMetrics(new_metrics, new_metrics);
}
- void LocalDestroy() {
- view_->LocalDestroy();
- }
- void LocalAddChild(View* child) {
- view_->LocalAddChild(child);
- }
- void LocalRemoveChild(View* child) {
- view_->LocalRemoveChild(child);
- }
+ void LocalDestroy() { view_->LocalDestroy(); }
+ void LocalAddChild(View* child) { view_->LocalAddChild(child); }
+ void LocalRemoveChild(View* child) { view_->LocalRemoveChild(child); }
void LocalReorder(View* relative, OrderDirection direction) {
view_->LocalReorder(relative, direction);
}
- void LocalSetBounds(const Rect& old_bounds,
- const Rect& new_bounds) {
+ void LocalSetBounds(const Rect& old_bounds, const Rect& new_bounds) {
view_->LocalSetBounds(old_bounds, new_bounds);
}
void LocalSetDrawn(bool drawn) { view_->LocalSetDrawn(drawn); }
@@ -69,4 +60,4 @@
} // namespace mojo
-#endif // MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_LIB_VIEW_PRIVATE_H_
+#endif // MOJO_SERVICES_VIEW_MANAGER_CPP_LIB_VIEW_PRIVATE_H_
diff --git a/mojo/services/view_manager/public/cpp/tests/BUILD.gn b/mojo/services/view_manager/cpp/tests/BUILD.gn
similarity index 86%
rename from mojo/services/view_manager/public/cpp/tests/BUILD.gn
rename to mojo/services/view_manager/cpp/tests/BUILD.gn
index 3d29cbb..46c8dff 100644
--- a/mojo/services/view_manager/public/cpp/tests/BUILD.gn
+++ b/mojo/services/view_manager/cpp/tests/BUILD.gn
@@ -14,8 +14,8 @@
]
deps = [
- "../../../../geometry/cpp",
- "../../../../geometry/interfaces",
+ "../../../geometry/cpp",
+ "../../../geometry/interfaces",
"//base",
"//base/test:test_support",
@@ -26,7 +26,7 @@
"//mojo/environment:chromium",
"//mojo/public/cpp/application",
"//mojo/public/cpp/system",
- "//mojo/services/view_manager/public/cpp",
+ "//mojo/services/view_manager/cpp",
"//testing/gtest",
]
diff --git a/mojo/services/view_manager/public/cpp/tests/run_all_unittests.cc b/mojo/services/view_manager/cpp/tests/run_all_unittests.cc
similarity index 68%
rename from mojo/services/view_manager/public/cpp/tests/run_all_unittests.cc
rename to mojo/services/view_manager/cpp/tests/run_all_unittests.cc
index 461b475..a3d5d1e 100644
--- a/mojo/services/view_manager/public/cpp/tests/run_all_unittests.cc
+++ b/mojo/services/view_manager/cpp/tests/run_all_unittests.cc
@@ -4,11 +4,12 @@
#include "base/bind.h"
#include "base/test/launcher/unit_test_launcher.h"
-#include "mojo/services/view_manager/public/cpp/tests/view_manager_test_suite.h"
+#include "mojo/services/view_manager/cpp/tests/view_manager_test_suite.h"
int main(int argc, char** argv) {
mojo::ViewManagerTestSuite test_suite(argc, argv);
return base::LaunchUnitTests(
- argc, argv, base::Bind(&base::TestSuite::Run, base::Unretained(&test_suite)));
+ argc, argv,
+ base::Bind(&base::TestSuite::Run, base::Unretained(&test_suite)));
}
diff --git a/mojo/services/view_manager/public/cpp/tests/view_manager_test_suite.cc b/mojo/services/view_manager/cpp/tests/view_manager_test_suite.cc
similarity index 86%
rename from mojo/services/view_manager/public/cpp/tests/view_manager_test_suite.cc
rename to mojo/services/view_manager/cpp/tests/view_manager_test_suite.cc
index 2bfdd1e..3614965 100644
--- a/mojo/services/view_manager/public/cpp/tests/view_manager_test_suite.cc
+++ b/mojo/services/view_manager/cpp/tests/view_manager_test_suite.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "mojo/services/view_manager/public/cpp/tests/view_manager_test_suite.h"
+#include "mojo/services/view_manager/cpp/tests/view_manager_test_suite.h"
#include "base/i18n/icu_util.h"
@@ -15,8 +15,7 @@
ViewManagerTestSuite::ViewManagerTestSuite(int argc, char** argv)
: TestSuite(argc, argv) {}
-ViewManagerTestSuite::~ViewManagerTestSuite() {
-}
+ViewManagerTestSuite::~ViewManagerTestSuite() {}
void ViewManagerTestSuite::Initialize() {
#if defined(USE_X11)
diff --git a/mojo/services/view_manager/public/cpp/tests/view_manager_test_suite.h b/mojo/services/view_manager/cpp/tests/view_manager_test_suite.h
similarity index 100%
rename from mojo/services/view_manager/public/cpp/tests/view_manager_test_suite.h
rename to mojo/services/view_manager/cpp/tests/view_manager_test_suite.h
diff --git a/mojo/services/view_manager/public/cpp/tests/view_unittest.cc b/mojo/services/view_manager/cpp/tests/view_unittest.cc
similarity index 93%
rename from mojo/services/view_manager/public/cpp/tests/view_unittest.cc
rename to mojo/services/view_manager/cpp/tests/view_unittest.cc
index a49733c..8c7d6dd 100644
--- a/mojo/services/view_manager/public/cpp/tests/view_unittest.cc
+++ b/mojo/services/view_manager/cpp/tests/view_unittest.cc
@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "mojo/services/view_manager/public/cpp/view.h"
+#include "mojo/services/view_manager/cpp/view.h"
#include "base/logging.h"
#include "base/strings/stringprintf.h"
-#include "mojo/services/view_manager/public/cpp/lib/view_private.h"
-#include "mojo/services/view_manager/public/cpp/util.h"
-#include "mojo/services/view_manager/public/cpp/view_observer.h"
-#include "mojo/services/view_manager/public/cpp/view_property.h"
+#include "mojo/services/view_manager/cpp/lib/view_private.h"
+#include "mojo/services/view_manager/cpp/util.h"
+#include "mojo/services/view_manager/cpp/view_observer.h"
+#include "mojo/services/view_manager/cpp/view_property.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace mojo {
@@ -21,9 +21,7 @@
// Subclass with public ctor/dtor.
class TestView : public View {
public:
- TestView() {
- ViewPrivate(this).set_id(1);
- }
+ TestView() { ViewPrivate(this).set_id(1); }
~TestView() {}
private:
@@ -191,8 +189,8 @@
bool TreeChangeParamsMatch(const ViewObserver::TreeChangeParams& lhs,
const ViewObserver::TreeChangeParams& rhs) {
- return lhs.target == rhs.target && lhs.old_parent == rhs.old_parent &&
- lhs.new_parent == rhs.new_parent && lhs.receiver == rhs.receiver;
+ return lhs.target == rhs.target && lhs.old_parent == rhs.old_parent &&
+ lhs.new_parent == rhs.new_parent && lhs.receiver == rhs.receiver;
}
class TreeChangeObserver : public ViewObserver {
@@ -202,9 +200,7 @@
}
~TreeChangeObserver() override { observee_->RemoveObserver(this); }
- void Reset() {
- received_params_.clear();
- }
+ void Reset() { received_params_.clear(); }
const std::vector<TreeChangeParams>& received_params() {
return received_params_;
@@ -213,9 +209,9 @@
private:
// Overridden from ViewObserver:
void OnTreeChanging(const TreeChangeParams& params) override {
- received_params_.push_back(params);
- }
- void OnTreeChanged(const TreeChangeParams& params) override {
+ received_params_.push_back(params);
+ }
+ void OnTreeChanged(const TreeChangeParams& params) override {
received_params_.push_back(params);
}
@@ -565,13 +561,13 @@
typedef std::vector<std::string> Changes;
std::string ViewIdToString(Id id) {
- return (id == 0) ? "null" :
- base::StringPrintf("%d,%d", HiWord(id), LoWord(id));
+ return (id == 0) ? "null"
+ : base::StringPrintf("%d,%d", HiWord(id), LoWord(id));
}
std::string RectToString(const Rect& rect) {
- return base::StringPrintf("%d,%d %dx%d",
- rect.x, rect.y, rect.width, rect.height);
+ return base::StringPrintf("%d,%d %dx%d", rect.x, rect.y, rect.width,
+ rect.height);
}
class BoundsChangeObserver : public ViewObserver {
@@ -592,22 +588,18 @@
void OnViewBoundsChanging(View* view,
const Rect& old_bounds,
const Rect& new_bounds) override {
- changes_.push_back(
- base::StringPrintf(
- "view=%s old_bounds=%s new_bounds=%s phase=changing",
- ViewIdToString(view->id()).c_str(),
- RectToString(old_bounds).c_str(),
- RectToString(new_bounds).c_str()));
+ changes_.push_back(base::StringPrintf(
+ "view=%s old_bounds=%s new_bounds=%s phase=changing",
+ ViewIdToString(view->id()).c_str(), RectToString(old_bounds).c_str(),
+ RectToString(new_bounds).c_str()));
}
void OnViewBoundsChanged(View* view,
const Rect& old_bounds,
const Rect& new_bounds) override {
- changes_.push_back(
- base::StringPrintf(
- "view=%s old_bounds=%s new_bounds=%s phase=changed",
- ViewIdToString(view->id()).c_str(),
- RectToString(old_bounds).c_str(),
- RectToString(new_bounds).c_str()));
+ changes_.push_back(base::StringPrintf(
+ "view=%s old_bounds=%s new_bounds=%s phase=changed",
+ ViewIdToString(view->id()).c_str(), RectToString(old_bounds).c_str(),
+ RectToString(new_bounds).c_str()));
}
View* view_;
@@ -830,9 +822,7 @@
class LocalPropertyChangeObserver : public ViewObserver {
public:
explicit LocalPropertyChangeObserver(View* view)
- : view_(view),
- property_key_(nullptr),
- old_property_value_(-1) {
+ : view_(view), property_key_(nullptr), old_property_value_(-1) {
view_->AddObserver(this);
}
~LocalPropertyChangeObserver() override { view_->RemoveObserver(this); }
@@ -877,8 +867,8 @@
EXPECT_EQ(PropertyChangeInfo(&prop, 3), o.PropertyChangeInfoAndClear());
// Sanity check to see if |PropertyChangeInfoAndClear| really clears.
- EXPECT_EQ(PropertyChangeInfo(
- reinterpret_cast<const void*>(NULL), -3), o.PropertyChangeInfoAndClear());
+ EXPECT_EQ(PropertyChangeInfo(reinterpret_cast<const void*>(NULL), -3),
+ o.PropertyChangeInfoAndClear());
}
} // namespace mojo
diff --git a/mojo/services/view_manager/public/cpp/types.h b/mojo/services/view_manager/cpp/types.h
similarity index 79%
rename from mojo/services/view_manager/public/cpp/types.h
rename to mojo/services/view_manager/cpp/types.h
index 5652691..3a2e5c8 100644
--- a/mojo/services/view_manager/public/cpp/types.h
+++ b/mojo/services/view_manager/cpp/types.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_TYPES_H_
-#define MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_TYPES_H_
+#ifndef MOJO_SERVICES_VIEW_MANAGER_CPP_TYPES_H_
+#define MOJO_SERVICES_VIEW_MANAGER_CPP_TYPES_H_
#include <stdint.h>
@@ -22,4 +22,4 @@
} // namespace mojo
-#endif // MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_TYPES_H_
+#endif // MOJO_SERVICES_VIEW_MANAGER_CPP_TYPES_H_
diff --git a/mojo/services/view_manager/public/cpp/util.h b/mojo/services/view_manager/cpp/util.h
similarity index 70%
rename from mojo/services/view_manager/public/cpp/util.h
rename to mojo/services/view_manager/cpp/util.h
index 33e75dd..7e58ad1 100644
--- a/mojo/services/view_manager/public/cpp/util.h
+++ b/mojo/services/view_manager/cpp/util.h
@@ -2,10 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_UTIL_H_
-#define MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_UTIL_H_
+#ifndef MOJO_SERVICES_VIEW_MANAGER_CPP_UTIL_H_
+#define MOJO_SERVICES_VIEW_MANAGER_CPP_UTIL_H_
-#include "view_manager/public/cpp/types.h"
+#include "view_manager/cpp/types.h"
// TODO(beng): #$*&@#(@ MacOSX SDK!
#if defined(HiWord)
@@ -27,4 +27,4 @@
} // namespace mojo
-#endif // MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_UTIL_H_
+#endif // MOJO_SERVICES_VIEW_MANAGER_CPP_UTIL_H_
diff --git a/mojo/services/view_manager/public/cpp/view.h b/mojo/services/view_manager/cpp/view.h
similarity index 95%
rename from mojo/services/view_manager/public/cpp/view.h
rename to mojo/services/view_manager/cpp/view.h
index 6578db8..ab294da 100644
--- a/mojo/services/view_manager/public/cpp/view.h
+++ b/mojo/services/view_manager/cpp/view.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_VIEW_H_
-#define MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_VIEW_H_
+#ifndef MOJO_SERVICES_VIEW_MANAGER_CPP_VIEW_H_
+#define MOJO_SERVICES_VIEW_MANAGER_CPP_VIEW_H_
#include <stdint.h>
#include <vector>
@@ -14,9 +14,9 @@
#include "mojo/public/cpp/system/macros.h"
#include "mojo/public/interfaces/application/service_provider.mojom.h"
#include "surfaces/interfaces/surface_id.mojom.h"
-#include "view_manager/public/cpp/types.h"
-#include "view_manager/public/interfaces/view_manager.mojom.h"
-#include "view_manager/public/interfaces/view_manager_constants.mojom.h"
+#include "view_manager/cpp/types.h"
+#include "view_manager/interfaces/view_manager.mojom.h"
+#include "view_manager/interfaces/view_manager_constants.mojom.h"
namespace mojo {
@@ -211,4 +211,4 @@
} // namespace mojo
-#endif // MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_VIEW_H_
+#endif // MOJO_SERVICES_VIEW_MANAGER_CPP_VIEW_H_
diff --git a/mojo/services/view_manager/public/cpp/view_manager.h b/mojo/services/view_manager/cpp/view_manager.h
similarity index 81%
rename from mojo/services/view_manager/public/cpp/view_manager.h
rename to mojo/services/view_manager/cpp/view_manager.h
index 5852dd2..b2018ec 100644
--- a/mojo/services/view_manager/public/cpp/view_manager.h
+++ b/mojo/services/view_manager/cpp/view_manager.h
@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_VIEW_MANAGER_H_
-#define MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_VIEW_MANAGER_H_
+#ifndef MOJO_SERVICES_VIEW_MANAGER_CPP_VIEW_MANAGER_H_
+#define MOJO_SERVICES_VIEW_MANAGER_CPP_VIEW_MANAGER_H_
#include <string>
-#include "view_manager/public/cpp/types.h"
+#include "view_manager/cpp/types.h"
namespace mojo {
class View;
@@ -39,4 +39,4 @@
} // namespace mojo
-#endif // MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_VIEW_MANAGER_H_
+#endif // MOJO_SERVICES_VIEW_MANAGER_CPP_VIEW_MANAGER_H_
diff --git a/mojo/services/view_manager/public/cpp/view_manager_client_factory.h b/mojo/services/view_manager/cpp/view_manager_client_factory.h
similarity index 80%
rename from mojo/services/view_manager/public/cpp/view_manager_client_factory.h
rename to mojo/services/view_manager/cpp/view_manager_client_factory.h
index e47da3d..f4e3cf8 100644
--- a/mojo/services/view_manager/public/cpp/view_manager_client_factory.h
+++ b/mojo/services/view_manager/cpp/view_manager_client_factory.h
@@ -2,11 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_VIEW_MANAGER_CLIENT_FACTORY_H_
-#define MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_VIEW_MANAGER_CLIENT_FACTORY_H_
+#ifndef MOJO_SERVICES_VIEW_MANAGER_CPP_VIEW_MANAGER_CLIENT_FACTORY_H_
+#define MOJO_SERVICES_VIEW_MANAGER_CPP_VIEW_MANAGER_CLIENT_FACTORY_H_
#include "mojo/public/cpp/application/interface_factory.h"
-#include "view_manager/public/interfaces/view_manager.mojom.h"
+#include "view_manager/interfaces/view_manager.mojom.h"
namespace mojo {
@@ -40,4 +40,4 @@
} // namespace mojo
-#endif // MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_VIEW_MANAGER_CLIENT_FACTORY_H_
+#endif // MOJO_SERVICES_VIEW_MANAGER_CPP_VIEW_MANAGER_CLIENT_FACTORY_H_
diff --git a/mojo/services/view_manager/public/cpp/view_manager_context.h b/mojo/services/view_manager/cpp/view_manager_context.h
similarity index 87%
rename from mojo/services/view_manager/public/cpp/view_manager_context.h
rename to mojo/services/view_manager/cpp/view_manager_context.h
index de7b84b..4065460 100644
--- a/mojo/services/view_manager/public/cpp/view_manager_context.h
+++ b/mojo/services/view_manager/cpp/view_manager_context.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_VIEW_MANAGER_CONTEXT_H_
-#define MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_VIEW_MANAGER_CONTEXT_H_
+#ifndef MOJO_SERVICES_VIEW_MANAGER_CPP_VIEW_MANAGER_CONTEXT_H_
+#define MOJO_SERVICES_VIEW_MANAGER_CPP_VIEW_MANAGER_CONTEXT_H_
#include <string>
#include <vector>
@@ -43,4 +43,4 @@
} // namespace mojo
-#endif // MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_VIEW_MANAGER_CONTEXT_H_
+#endif // MOJO_SERVICES_VIEW_MANAGER_CPP_VIEW_MANAGER_CONTEXT_H_
diff --git a/mojo/services/view_manager/public/cpp/view_manager_delegate.cc b/mojo/services/view_manager/cpp/view_manager_delegate.cc
similarity index 85%
rename from mojo/services/view_manager/public/cpp/view_manager_delegate.cc
rename to mojo/services/view_manager/cpp/view_manager_delegate.cc
index 4ae64a7..959640d 100644
--- a/mojo/services/view_manager/public/cpp/view_manager_delegate.cc
+++ b/mojo/services/view_manager/cpp/view_manager_delegate.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "view_manager/public/cpp/view_manager_delegate.h"
+#include "view_manager/cpp/view_manager_delegate.h"
namespace mojo {
diff --git a/mojo/services/view_manager/public/cpp/view_manager_delegate.h b/mojo/services/view_manager/cpp/view_manager_delegate.h
similarity index 89%
rename from mojo/services/view_manager/public/cpp/view_manager_delegate.h
rename to mojo/services/view_manager/cpp/view_manager_delegate.h
index 1590a59..35775cd 100644
--- a/mojo/services/view_manager/public/cpp/view_manager_delegate.h
+++ b/mojo/services/view_manager/cpp/view_manager_delegate.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_VIEW_MANAGER_DELEGATE_H_
-#define MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_VIEW_MANAGER_DELEGATE_H_
+#ifndef MOJO_SERVICES_VIEW_MANAGER_CPP_VIEW_MANAGER_DELEGATE_H_
+#define MOJO_SERVICES_VIEW_MANAGER_CPP_VIEW_MANAGER_DELEGATE_H_
#include <string>
@@ -49,4 +49,4 @@
} // namespace mojo
-#endif // MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_VIEW_MANAGER_DELEGATE_H_
+#endif // MOJO_SERVICES_VIEW_MANAGER_CPP_VIEW_MANAGER_DELEGATE_H_
diff --git a/mojo/services/view_manager/public/cpp/view_observer.h b/mojo/services/view_manager/cpp/view_observer.h
similarity index 90%
rename from mojo/services/view_manager/public/cpp/view_observer.h
rename to mojo/services/view_manager/cpp/view_observer.h
index 1bc19fa..720a5b5 100644
--- a/mojo/services/view_manager/public/cpp/view_observer.h
+++ b/mojo/services/view_manager/cpp/view_observer.h
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_VIEW_OBSERVER_H_
-#define MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_VIEW_OBSERVER_H_
+#ifndef MOJO_SERVICES_VIEW_MANAGER_CPP_VIEW_OBSERVER_H_
+#define MOJO_SERVICES_VIEW_MANAGER_CPP_VIEW_OBSERVER_H_
#include <vector>
#include "input_events/interfaces/input_events.mojom.h"
-#include "view_manager/public/cpp/view.h"
+#include "view_manager/cpp/view.h"
namespace mojo {
@@ -85,10 +85,9 @@
// way, it can simply be compared for equality with the property
// constant. |old| is the old property value, which must be cast to the
// appropriate type before use.
- virtual void OnViewLocalPropertyChanged(
- View* view,
- const void* key,
- intptr_t old) {}
+ virtual void OnViewLocalPropertyChanged(View* view,
+ const void* key,
+ intptr_t old) {}
virtual void OnViewEmbeddedAppDisconnected(View* view) {}
@@ -103,4 +102,4 @@
} // namespace mojo
-#endif // MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_VIEW_OBSERVER_H_
+#endif // MOJO_SERVICES_VIEW_MANAGER_CPP_VIEW_OBSERVER_H_
diff --git a/mojo/services/view_manager/public/cpp/view_property.h b/mojo/services/view_manager/cpp/view_property.h
similarity index 93%
rename from mojo/services/view_manager/public/cpp/view_property.h
rename to mojo/services/view_manager/cpp/view_property.h
index 2dbd317..312b9bb 100644
--- a/mojo/services/view_manager/public/cpp/view_property.h
+++ b/mojo/services/view_manager/cpp/view_property.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_VIEW_PROPERTY_H_
-#define MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_VIEW_PROPERTY_H_
+#ifndef MOJO_SERVICES_VIEW_MANAGER_CPP_VIEW_PROPERTY_H_
+#define MOJO_SERVICES_VIEW_MANAGER_CPP_VIEW_PROPERTY_H_
#include <stdint.h>
@@ -12,7 +12,7 @@
//
// To define a new ViewProperty:
//
-// #include "view_manager/public/cpp/view_property.h"
+// #include "view_manager/cpp/view_property.h"
//
// DECLARE_EXPORTED_VIEW_PROPERTY_TYPE(FOO_EXPORT, MyType);
// namespace foo {
@@ -131,10 +131,9 @@
enum { type_must_be_complete = sizeof(TYPE) }; \
delete mojo::ViewPropertyCaster<TYPE*>::FromInt64(p); \
} \
- const mojo::ViewProperty<TYPE*> NAME##_Value = {DEFAULT, \
- #NAME, \
+ const mojo::ViewProperty<TYPE*> NAME##_Value = {DEFAULT, #NAME, \
&Deallocator##NAME}; \
} \
const mojo::ViewProperty<TYPE*>* const NAME = &NAME##_Value;
-#endif // MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_VIEW_PROPERTY_H_
+#endif // MOJO_SERVICES_VIEW_MANAGER_CPP_VIEW_PROPERTY_H_
diff --git a/mojo/services/view_manager/public/cpp/view_tracker.cc b/mojo/services/view_manager/cpp/view_tracker.cc
similarity index 90%
rename from mojo/services/view_manager/public/cpp/view_tracker.cc
rename to mojo/services/view_manager/cpp/view_tracker.cc
index 317b97a..35ab3d4 100644
--- a/mojo/services/view_manager/public/cpp/view_tracker.cc
+++ b/mojo/services/view_manager/cpp/view_tracker.cc
@@ -2,12 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "view_manager/public/cpp/view_tracker.h"
+#include "view_manager/cpp/view_tracker.h"
namespace mojo {
-ViewTracker::ViewTracker() {
-}
+ViewTracker::ViewTracker() {}
ViewTracker::~ViewTracker() {
for (Views::iterator i = views_.begin(); i != views_.end(); ++i)
diff --git a/mojo/services/view_manager/public/cpp/view_tracker.h b/mojo/services/view_manager/cpp/view_tracker.h
similarity index 79%
rename from mojo/services/view_manager/public/cpp/view_tracker.h
rename to mojo/services/view_manager/cpp/view_tracker.h
index cfc2b9d..572e535 100644
--- a/mojo/services/view_manager/public/cpp/view_tracker.h
+++ b/mojo/services/view_manager/cpp/view_tracker.h
@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_VIEW_TRACKER_H_
-#define MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_VIEW_TRACKER_H_
+#ifndef MOJO_SERVICES_VIEW_MANAGER_CPP_VIEW_TRACKER_H_
+#define MOJO_SERVICES_VIEW_MANAGER_CPP_VIEW_TRACKER_H_
#include <stdint.h>
#include <set>
#include "mojo/public/cpp/system/macros.h"
-#include "view_manager/public/cpp/view_observer.h"
+#include "view_manager/cpp/view_observer.h"
namespace mojo {
@@ -44,4 +44,4 @@
} // namespace mojo
-#endif // MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_VIEW_TRACKER_H_
+#endif // MOJO_SERVICES_VIEW_MANAGER_CPP_VIEW_TRACKER_H_
diff --git a/mojo/services/view_manager/public/interfaces/BUILD.gn b/mojo/services/view_manager/interfaces/BUILD.gn
similarity index 67%
rename from mojo/services/view_manager/public/interfaces/BUILD.gn
rename to mojo/services/view_manager/interfaces/BUILD.gn
index b2273ad..8d687a0 100644
--- a/mojo/services/view_manager/public/interfaces/BUILD.gn
+++ b/mojo/services/view_manager/interfaces/BUILD.gn
@@ -12,14 +12,14 @@
"view_manager_constants.mojom",
]
- import_dirs = [ get_path_info("../../../", "abspath") ]
+ import_dirs = [ get_path_info("../../", "abspath") ]
mojo_sdk_deps = [ "mojo/public/interfaces/application" ]
deps = [
- "../../../geometry/interfaces",
- "../../../input_events/interfaces",
- "../../../native_viewport/interfaces",
- "../../../surfaces/interfaces:surface_id",
+ "../../geometry/interfaces",
+ "../../input_events/interfaces",
+ "../../native_viewport/interfaces",
+ "../../surfaces/interfaces:surface_id",
]
}
diff --git a/mojo/services/view_manager/public/interfaces/animations.mojom b/mojo/services/view_manager/interfaces/animations.mojom
similarity index 100%
rename from mojo/services/view_manager/public/interfaces/animations.mojom
rename to mojo/services/view_manager/interfaces/animations.mojom
diff --git a/mojo/services/view_manager/public/interfaces/view_manager.mojom b/mojo/services/view_manager/interfaces/view_manager.mojom
similarity index 99%
rename from mojo/services/view_manager/public/interfaces/view_manager.mojom
rename to mojo/services/view_manager/interfaces/view_manager.mojom
index c3f1d4d..8c3dc0d 100644
--- a/mojo/services/view_manager/public/interfaces/view_manager.mojom
+++ b/mojo/services/view_manager/interfaces/view_manager.mojom
@@ -10,7 +10,7 @@
import "mojo/public/interfaces/application/service_provider.mojom";
import "native_viewport/interfaces/native_viewport.mojom";
import "surfaces/interfaces/surface_id.mojom";
-import "view_manager/public/interfaces/view_manager_constants.mojom";
+import "view_manager/interfaces/view_manager_constants.mojom";
struct ViewData {
uint32 parent_id;
diff --git a/mojo/services/view_manager/public/interfaces/view_manager_constants.mojom b/mojo/services/view_manager/interfaces/view_manager_constants.mojom
similarity index 100%
rename from mojo/services/view_manager/public/interfaces/view_manager_constants.mojom
rename to mojo/services/view_manager/interfaces/view_manager_constants.mojom
diff --git a/mojo/services/window_manager/public/interfaces/BUILD.gn b/mojo/services/window_manager/interfaces/BUILD.gn
similarity index 76%
rename from mojo/services/window_manager/public/interfaces/BUILD.gn
rename to mojo/services/window_manager/interfaces/BUILD.gn
index 74dca42..e5415a1 100644
--- a/mojo/services/window_manager/public/interfaces/BUILD.gn
+++ b/mojo/services/window_manager/interfaces/BUILD.gn
@@ -11,12 +11,12 @@
"window_manager_internal.mojom",
]
- import_dirs = [ get_path_info("../../../", "abspath") ]
+ import_dirs = [ get_path_info("../../", "abspath") ]
mojo_sdk_deps = [ "mojo/public/interfaces/application" ]
deps = [
- "../../../geometry/interfaces",
- "../../../input_events/interfaces",
+ "../../geometry/interfaces",
+ "../../input_events/interfaces",
]
}
diff --git a/mojo/services/window_manager/public/interfaces/window_manager.mojom b/mojo/services/window_manager/interfaces/window_manager.mojom
similarity index 100%
rename from mojo/services/window_manager/public/interfaces/window_manager.mojom
rename to mojo/services/window_manager/interfaces/window_manager.mojom
diff --git a/mojo/services/window_manager/public/interfaces/window_manager_internal.mojom b/mojo/services/window_manager/interfaces/window_manager_internal.mojom
similarity index 100%
rename from mojo/services/window_manager/public/interfaces/window_manager_internal.mojom
rename to mojo/services/window_manager/interfaces/window_manager_internal.mojom
diff --git a/services/debugger/BUILD.gn b/services/debugger/BUILD.gn
index 4eea5b9..13e11e8 100644
--- a/services/debugger/BUILD.gn
+++ b/services/debugger/BUILD.gn
@@ -25,6 +25,6 @@
"//mojo/services/http_server/interfaces",
"//mojo/services/network/public/interfaces",
"//mojo/services/tracing/interfaces",
- "//mojo/services/window_manager/public/interfaces",
+ "//mojo/services/window_manager/interfaces",
]
}
diff --git a/services/debugger/debugger.cc b/services/debugger/debugger.cc
index 1c4c5a6..b7aa4e9 100644
--- a/services/debugger/debugger.cc
+++ b/services/debugger/debugger.cc
@@ -19,7 +19,7 @@
#include "mojo/services/http_server/interfaces/http_server_factory.mojom.h"
#include "mojo/services/network/public/interfaces/net_address.mojom.h"
#include "mojo/services/tracing/interfaces/tracing.mojom.h"
-#include "mojo/services/window_manager/public/interfaces/window_manager.mojom.h"
+#include "mojo/services/window_manager/interfaces/window_manager.mojom.h"
#include "services/debugger/trace_collector.h"
// Debugger is a Mojo application that exposes an http server and talks to other
diff --git a/services/keyboard_native/BUILD.gn b/services/keyboard_native/BUILD.gn
index 562c922..f3cdcfc 100644
--- a/services/keyboard_native/BUILD.gn
+++ b/services/keyboard_native/BUILD.gn
@@ -50,7 +50,7 @@
"//mojo/services/surfaces/cpp",
"//mojo/services/surfaces/interfaces",
"//mojo/services/surfaces/interfaces:surface_id",
- "//mojo/services/view_manager/public/cpp",
+ "//mojo/services/view_manager/cpp",
"//mojo/skia",
"//skia",
"//ui/gfx",
diff --git a/services/keyboard_native/main.cc b/services/keyboard_native/main.cc
index b0c29d3..1ad2537 100644
--- a/services/keyboard_native/main.cc
+++ b/services/keyboard_native/main.cc
@@ -11,8 +11,8 @@
#include "mojo/public/cpp/application/interface_factory.h"
#include "mojo/public/cpp/application/service_provider_impl.h"
#include "mojo/public/cpp/bindings/interface_request.h"
-#include "mojo/services/view_manager/public/cpp/view_manager_client_factory.h"
-#include "mojo/services/view_manager/public/cpp/view_manager_delegate.h"
+#include "mojo/services/view_manager/cpp/view_manager_client_factory.h"
+#include "mojo/services/view_manager/cpp/view_manager_delegate.h"
#include "services/keyboard_native/keyboard_service_impl.h"
namespace keyboard {
diff --git a/services/keyboard_native/view_observer_delegate.h b/services/keyboard_native/view_observer_delegate.h
index 9e0572c..59b64b2 100644
--- a/services/keyboard_native/view_observer_delegate.h
+++ b/services/keyboard_native/view_observer_delegate.h
@@ -8,7 +8,7 @@
#include "base/time/time.h"
#include "mojo/gpu/texture_cache.h"
#include "mojo/gpu/texture_uploader.h"
-#include "mojo/services/view_manager/public/cpp/view_observer.h"
+#include "mojo/services/view_manager/cpp/view_observer.h"
#include "mojo/skia/ganesh_context.h"
#include "services/keyboard_native/key_layout.h"
#include "services/keyboard_native/material_splash_animation.h"
diff --git a/services/kiosk_wm/BUILD.gn b/services/kiosk_wm/BUILD.gn
index 0b7f1f3..0649962 100644
--- a/services/kiosk_wm/BUILD.gn
+++ b/services/kiosk_wm/BUILD.gn
@@ -29,8 +29,8 @@
"//mojo/public/interfaces/application",
"//mojo/services/input_events/interfaces",
"//mojo/services/navigation/interfaces",
- "//mojo/services/view_manager/public/cpp",
- "//mojo/services/window_manager/public/interfaces:interfaces",
+ "//mojo/services/view_manager/cpp",
+ "//mojo/services/window_manager/interfaces:interfaces",
"//services/window_manager:lib",
"//ui/base",
]
diff --git a/services/kiosk_wm/kiosk_wm.cc b/services/kiosk_wm/kiosk_wm.cc
index 05c5d6b..9d4f3ab 100644
--- a/services/kiosk_wm/kiosk_wm.cc
+++ b/services/kiosk_wm/kiosk_wm.cc
@@ -4,7 +4,7 @@
#include "services/kiosk_wm/kiosk_wm.h"
-#include "mojo/services/window_manager/public/interfaces/window_manager.mojom.h"
+#include "mojo/services/window_manager/interfaces/window_manager.mojom.h"
#include "services/kiosk_wm/kiosk_wm_controller.h"
#include "services/window_manager/window_manager_delegate.h"
diff --git a/services/kiosk_wm/kiosk_wm_controller.h b/services/kiosk_wm/kiosk_wm_controller.h
index 1791b11..25b7477 100644
--- a/services/kiosk_wm/kiosk_wm_controller.h
+++ b/services/kiosk_wm/kiosk_wm_controller.h
@@ -11,9 +11,9 @@
#include "mojo/public/cpp/application/service_provider_impl.h"
#include "mojo/services/input_events/interfaces/input_events.mojom.h"
#include "mojo/services/navigation/interfaces/navigation.mojom.h"
-#include "mojo/services/view_manager/public/cpp/view_manager.h"
-#include "mojo/services/view_manager/public/cpp/view_manager_delegate.h"
-#include "mojo/services/view_manager/public/cpp/view_observer.h"
+#include "mojo/services/view_manager/cpp/view_manager.h"
+#include "mojo/services/view_manager/cpp/view_manager_delegate.h"
+#include "mojo/services/view_manager/cpp/view_observer.h"
#include "services/kiosk_wm/navigator_host_impl.h"
#include "services/window_manager/window_manager_app.h"
#include "services/window_manager/window_manager_delegate.h"
diff --git a/services/vanadium/security/BUILD.gn b/services/vanadium/security/BUILD.gn
index 9fb923c..5959ab4 100644
--- a/services/vanadium/security/BUILD.gn
+++ b/services/vanadium/security/BUILD.gn
@@ -11,6 +11,6 @@
"wire_blessings.go",
]
deps = [
- "//mojo/services/vanadium/security/public/interfaces",
+ "//mojo/services/vanadium/security/interfaces",
]
}
diff --git a/services/vanadium/security/principal_service.go b/services/vanadium/security/principal_service.go
index 26ebe66..6f31f5b 100644
--- a/services/vanadium/security/principal_service.go
+++ b/services/vanadium/security/principal_service.go
@@ -20,7 +20,7 @@
auth "mojo/services/authentication/interfaces/authentication"
network "mojo/services/network/public/interfaces/network_service"
"mojo/services/network/public/interfaces/url_loader"
- vpkg "mojo/services/vanadium/security/public/interfaces/principal"
+ vpkg "mojo/services/vanadium/security/interfaces/principal"
)
//#include "mojo/public/c/system/types.h"
diff --git a/services/vanadium/security/wire_blessings.go b/services/vanadium/security/wire_blessings.go
index b81b871..b724000 100644
--- a/services/vanadium/security/wire_blessings.go
+++ b/services/vanadium/security/wire_blessings.go
@@ -4,7 +4,7 @@
package main
-import vpkg "mojo/services/vanadium/security/public/interfaces/principal"
+import vpkg "mojo/services/vanadium/security/interfaces/principal"
// wireBlessings encapsulates wire format of a set of a Vanadium blessings
// and the corresponding cryptographic proof that binds them to a principal
diff --git a/services/view_manager/BUILD.gn b/services/view_manager/BUILD.gn
index 6dc39c6..777fa97 100644
--- a/services/view_manager/BUILD.gn
+++ b/services/view_manager/BUILD.gn
@@ -23,8 +23,8 @@
"//mojo/environment:chromium",
"//mojo/converters/geometry",
"//mojo/public/cpp/bindings:bindings",
- "//mojo/services/view_manager/public/interfaces",
- "//mojo/services/window_manager/public/interfaces",
+ "//mojo/services/view_manager/interfaces",
+ "//mojo/services/window_manager/interfaces",
]
}
@@ -70,7 +70,7 @@
]
public_deps = [
- "//mojo/services/view_manager/public/cpp",
+ "//mojo/services/view_manager/cpp",
]
deps = [
@@ -89,9 +89,9 @@
"//mojo/services/native_viewport/interfaces",
"//mojo/services/surfaces/cpp",
"//mojo/services/surfaces/interfaces",
- "//mojo/services/view_manager/public/interfaces",
- "//mojo/services/view_manager/public/cpp:common",
- "//mojo/services/window_manager/public/interfaces",
+ "//mojo/services/view_manager/interfaces",
+ "//mojo/services/view_manager/cpp:common",
+ "//mojo/services/window_manager/interfaces",
"//ui/gfx",
"//ui/gfx/geometry",
]
@@ -110,9 +110,9 @@
"//mojo/converters/array_string",
"//mojo/public/cpp/bindings:bindings",
"//mojo/services/geometry/interfaces",
- "//mojo/services/view_manager/public/cpp",
- "//mojo/services/view_manager/public/cpp:common",
- "//mojo/services/view_manager/public/interfaces",
+ "//mojo/services/view_manager/cpp",
+ "//mojo/services/view_manager/cpp:common",
+ "//mojo/services/view_manager/interfaces",
]
}
@@ -143,9 +143,9 @@
"//mojo/services/geometry/interfaces",
"//mojo/services/input_events/interfaces",
"//mojo/services/native_viewport/cpp:args",
- "//mojo/services/view_manager/public/cpp",
- "//mojo/services/view_manager/public/interfaces",
- "//mojo/services/window_manager/public/interfaces",
+ "//mojo/services/view_manager/cpp",
+ "//mojo/services/view_manager/interfaces",
+ "//mojo/services/window_manager/interfaces",
"//testing/gtest",
"//ui/gfx",
"//ui/gfx:test_support",
@@ -170,7 +170,7 @@
"//mojo/application",
"//mojo/application:test_support",
"//mojo/services/geometry/cpp",
- "//mojo/services/view_manager/public/cpp",
+ "//mojo/services/view_manager/cpp",
]
}
@@ -189,8 +189,8 @@
"//mojo/common",
"//mojo/public/cpp/bindings",
"//mojo/services/geometry/interfaces",
- "//mojo/services/view_manager/public/cpp",
- "//mojo/services/view_manager/public/interfaces",
- "//mojo/services/window_manager/public/interfaces",
+ "//mojo/services/view_manager/cpp",
+ "//mojo/services/view_manager/interfaces",
+ "//mojo/services/window_manager/interfaces",
]
}
diff --git a/services/view_manager/access_policy.h b/services/view_manager/access_policy.h
index 2c8530f..91560bc 100644
--- a/services/view_manager/access_policy.h
+++ b/services/view_manager/access_policy.h
@@ -5,7 +5,7 @@
#ifndef SERVICES_VIEW_MANAGER_ACCESS_POLICY_H_
#define SERVICES_VIEW_MANAGER_ACCESS_POLICY_H_
-#include "mojo/services/view_manager/public/interfaces/view_manager_constants.mojom.h"
+#include "mojo/services/view_manager/interfaces/view_manager_constants.mojom.h"
#include "services/view_manager/ids.h"
namespace view_manager {
diff --git a/services/view_manager/animation_runner_unittest.cc b/services/view_manager/animation_runner_unittest.cc
index 26832c5..2654648 100644
--- a/services/view_manager/animation_runner_unittest.cc
+++ b/services/view_manager/animation_runner_unittest.cc
@@ -6,7 +6,7 @@
#include "base/strings/stringprintf.h"
#include "mojo/converters/geometry/geometry_type_converters.h"
-#include "mojo/services/view_manager/public/interfaces/view_manager_constants.mojom.h"
+#include "mojo/services/view_manager/interfaces/view_manager_constants.mojom.h"
#include "services/view_manager/animation_runner_observer.h"
#include "services/view_manager/scheduled_animation_group.h"
#include "services/view_manager/server_view.h"
diff --git a/services/view_manager/client_connection.h b/services/view_manager/client_connection.h
index 8d69cdd..84f5b1a 100644
--- a/services/view_manager/client_connection.h
+++ b/services/view_manager/client_connection.h
@@ -7,7 +7,7 @@
#include "base/memory/scoped_ptr.h"
#include "mojo/public/cpp/bindings/binding.h"
-#include "mojo/services/view_manager/public/interfaces/view_manager.mojom.h"
+#include "mojo/services/view_manager/interfaces/view_manager.mojom.h"
namespace view_manager {
diff --git a/services/view_manager/connection_manager.h b/services/view_manager/connection_manager.h
index 2d43f78..108f456 100644
--- a/services/view_manager/connection_manager.h
+++ b/services/view_manager/connection_manager.h
@@ -12,8 +12,8 @@
#include "base/memory/scoped_ptr.h"
#include "base/timer/timer.h"
#include "mojo/public/cpp/bindings/array.h"
-#include "mojo/services/view_manager/public/interfaces/view_manager.mojom.h"
-#include "mojo/services/window_manager/public/interfaces/window_manager_internal.mojom.h"
+#include "mojo/services/view_manager/interfaces/view_manager.mojom.h"
+#include "mojo/services/window_manager/interfaces/window_manager_internal.mojom.h"
#include "services/view_manager/animation_runner.h"
#include "services/view_manager/ids.h"
#include "services/view_manager/server_view_delegate.h"
diff --git a/services/view_manager/connection_manager_delegate.h b/services/view_manager/connection_manager_delegate.h
index fb4612f..fea9afe 100644
--- a/services/view_manager/connection_manager_delegate.h
+++ b/services/view_manager/connection_manager_delegate.h
@@ -8,7 +8,7 @@
#include <string>
#include "mojo/public/cpp/bindings/interface_request.h"
-#include "mojo/services/view_manager/public/cpp/types.h"
+#include "mojo/services/view_manager/cpp/types.h"
namespace mojo {
class ViewManagerService;
diff --git a/services/view_manager/display_manager.h b/services/view_manager/display_manager.h
index 9d308a1..99b6a46 100644
--- a/services/view_manager/display_manager.h
+++ b/services/view_manager/display_manager.h
@@ -14,7 +14,7 @@
#include "mojo/public/cpp/bindings/callback.h"
#include "mojo/services/native_viewport/interfaces/native_viewport.mojom.h"
#include "mojo/services/surfaces/interfaces/display.mojom.h"
-#include "mojo/services/view_manager/public/interfaces/view_manager.mojom.h"
+#include "mojo/services/view_manager/interfaces/view_manager.mojom.h"
#include "ui/gfx/rect.h"
namespace cc {
diff --git a/services/view_manager/gesture_manager.cc b/services/view_manager/gesture_manager.cc
index 13ac68b..4cc6428 100644
--- a/services/view_manager/gesture_manager.cc
+++ b/services/view_manager/gesture_manager.cc
@@ -7,7 +7,7 @@
#include <algorithm>
#include "mojo/services/input_events/interfaces/input_events.mojom.h"
-#include "mojo/services/view_manager/public/cpp/keys.h"
+#include "mojo/services/view_manager/cpp/keys.h"
#include "services/view_manager/gesture_manager_delegate.h"
#include "services/view_manager/server_view.h"
#include "services/view_manager/view_coordinate_conversions.h"
diff --git a/services/view_manager/gesture_manager_delegate.h b/services/view_manager/gesture_manager_delegate.h
index f5f4a2f..44f2e60 100644
--- a/services/view_manager/gesture_manager_delegate.h
+++ b/services/view_manager/gesture_manager_delegate.h
@@ -8,7 +8,7 @@
#include <set>
#include "mojo/services/input_events/interfaces/input_events.mojom.h"
-#include "mojo/services/view_manager/public/cpp/types.h"
+#include "mojo/services/view_manager/cpp/types.h"
namespace view_manager {
diff --git a/services/view_manager/gesture_manager_unittest.cc b/services/view_manager/gesture_manager_unittest.cc
index ac51285..4b7cb91 100644
--- a/services/view_manager/gesture_manager_unittest.cc
+++ b/services/view_manager/gesture_manager_unittest.cc
@@ -7,7 +7,7 @@
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
#include "mojo/services/input_events/interfaces/input_events.mojom.h"
-#include "mojo/services/view_manager/public/cpp/keys.h"
+#include "mojo/services/view_manager/cpp/keys.h"
#include "services/view_manager/gesture_manager_delegate.h"
#include "services/view_manager/server_view.h"
#include "services/view_manager/test_server_view_delegate.h"
diff --git a/services/view_manager/ids.h b/services/view_manager/ids.h
index b9cf626..b305854 100644
--- a/services/view_manager/ids.h
+++ b/services/view_manager/ids.h
@@ -5,8 +5,8 @@
#ifndef SERVICES_VIEW_MANAGER_IDS_H_
#define SERVICES_VIEW_MANAGER_IDS_H_
-#include "mojo/services/view_manager/public/cpp/types.h"
-#include "mojo/services/view_manager/public/cpp/util.h"
+#include "mojo/services/view_manager/cpp/types.h"
+#include "mojo/services/view_manager/cpp/util.h"
namespace view_manager {
diff --git a/services/view_manager/scheduled_animation_group.h b/services/view_manager/scheduled_animation_group.h
index 2b139f6..ca5c241 100644
--- a/services/view_manager/scheduled_animation_group.h
+++ b/services/view_manager/scheduled_animation_group.h
@@ -9,7 +9,7 @@
#include "base/memory/scoped_ptr.h"
#include "base/time/time.h"
-#include "mojo/services/view_manager/public/interfaces/animations.mojom.h"
+#include "mojo/services/view_manager/interfaces/animations.mojom.h"
#include "ui/gfx/animation/tween.h"
#include "ui/gfx/transform.h"
diff --git a/services/view_manager/scheduled_animation_group_unittest.cc b/services/view_manager/scheduled_animation_group_unittest.cc
index 1e18119..cc55024 100644
--- a/services/view_manager/scheduled_animation_group_unittest.cc
+++ b/services/view_manager/scheduled_animation_group_unittest.cc
@@ -5,7 +5,7 @@
#include "services/view_manager/scheduled_animation_group.h"
#include "mojo/converters/geometry/geometry_type_converters.h"
-#include "mojo/services/view_manager/public/interfaces/animations.mojom.h"
+#include "mojo/services/view_manager/interfaces/animations.mojom.h"
#include "services/view_manager/server_view.h"
#include "services/view_manager/test_server_view_delegate.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/services/view_manager/server_view.h b/services/view_manager/server_view.h
index b8f07b0..83883f4 100644
--- a/services/view_manager/server_view.h
+++ b/services/view_manager/server_view.h
@@ -10,7 +10,7 @@
#include "base/logging.h"
#include "base/observer_list.h"
#include "cc/surfaces/surface_id.h"
-#include "mojo/services/view_manager/public/interfaces/view_manager.mojom.h"
+#include "mojo/services/view_manager/interfaces/view_manager.mojom.h"
#include "services/view_manager/ids.h"
#include "ui/gfx/geometry/rect.h"
#include "ui/gfx/transform.h"
diff --git a/services/view_manager/server_view_delegate.h b/services/view_manager/server_view_delegate.h
index 97c14cc..0a3e3ee 100644
--- a/services/view_manager/server_view_delegate.h
+++ b/services/view_manager/server_view_delegate.h
@@ -5,7 +5,7 @@
#ifndef SERVICES_VIEW_MANAGER_SERVER_VIEW_DELEGATE_H_
#define SERVICES_VIEW_MANAGER_SERVER_VIEW_DELEGATE_H_
-#include "mojo/services/view_manager/public/interfaces/view_manager_constants.mojom.h"
+#include "mojo/services/view_manager/interfaces/view_manager_constants.mojom.h"
namespace gfx {
class Rect;
diff --git a/services/view_manager/server_view_observer.h b/services/view_manager/server_view_observer.h
index 71c1588..dab9f22 100644
--- a/services/view_manager/server_view_observer.h
+++ b/services/view_manager/server_view_observer.h
@@ -5,7 +5,7 @@
#ifndef SERVICES_VIEW_MANAGER_SERVER_VIEW_OBSERVER_H_
#define SERVICES_VIEW_MANAGER_SERVER_VIEW_OBSERVER_H_
-#include "mojo/services/view_manager/public/interfaces/view_manager_constants.mojom.h"
+#include "mojo/services/view_manager/interfaces/view_manager_constants.mojom.h"
namespace gfx {
class Rect;
diff --git a/services/view_manager/test_change_tracker.cc b/services/view_manager/test_change_tracker.cc
index d88b2f1..f7fd069 100644
--- a/services/view_manager/test_change_tracker.cc
+++ b/services/view_manager/test_change_tracker.cc
@@ -7,7 +7,7 @@
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
#include "mojo/converters/array_string/array_string_type_converters.h"
-#include "mojo/services/view_manager/public/cpp/util.h"
+#include "mojo/services/view_manager/cpp/util.h"
using mojo::Array;
using mojo::Id;
diff --git a/services/view_manager/test_change_tracker.h b/services/view_manager/test_change_tracker.h
index f487c28..da5d08c 100644
--- a/services/view_manager/test_change_tracker.h
+++ b/services/view_manager/test_change_tracker.h
@@ -11,8 +11,8 @@
#include "base/basictypes.h"
#include "mojo/public/cpp/bindings/array.h"
#include "mojo/services/geometry/interfaces/geometry.mojom.h"
-#include "mojo/services/view_manager/public/cpp/types.h"
-#include "mojo/services/view_manager/public/interfaces/view_manager.mojom.h"
+#include "mojo/services/view_manager/cpp/types.h"
+#include "mojo/services/view_manager/interfaces/view_manager.mojom.h"
namespace view_manager {
diff --git a/services/view_manager/view_manager_client_apptest.cc b/services/view_manager/view_manager_client_apptest.cc
index 417ea07..0aaccf4 100644
--- a/services/view_manager/view_manager_client_apptest.cc
+++ b/services/view_manager/view_manager_client_apptest.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "mojo/services/view_manager/public/cpp/view_manager.h"
+#include "mojo/services/view_manager/cpp/view_manager.h"
#include "base/bind.h"
#include "base/location.h"
@@ -17,11 +17,11 @@
#include "mojo/public/cpp/application/application_test_base.h"
#include "mojo/public/cpp/application/service_provider_impl.h"
#include "mojo/services/geometry/cpp/geometry_util.h"
-#include "mojo/services/view_manager/public/cpp/lib/view_manager_client_impl.h"
-#include "mojo/services/view_manager/public/cpp/view_manager_client_factory.h"
-#include "mojo/services/view_manager/public/cpp/view_manager_context.h"
-#include "mojo/services/view_manager/public/cpp/view_manager_delegate.h"
-#include "mojo/services/view_manager/public/cpp/view_observer.h"
+#include "mojo/services/view_manager/cpp/lib/view_manager_client_impl.h"
+#include "mojo/services/view_manager/cpp/view_manager_client_factory.h"
+#include "mojo/services/view_manager/cpp/view_manager_context.h"
+#include "mojo/services/view_manager/cpp/view_manager_delegate.h"
+#include "mojo/services/view_manager/cpp/view_observer.h"
namespace mojo {
diff --git a/services/view_manager/view_manager_root_connection.h b/services/view_manager/view_manager_root_connection.h
index 68a2087..2d8348e 100644
--- a/services/view_manager/view_manager_root_connection.h
+++ b/services/view_manager/view_manager_root_connection.h
@@ -10,8 +10,8 @@
#include "mojo/public/cpp/application/application_impl.h"
#include "mojo/public/cpp/application/interface_factory.h"
#include "mojo/public/cpp/bindings/binding.h"
-#include "mojo/services/view_manager/public/interfaces/view_manager.mojom.h"
-#include "mojo/services/window_manager/public/interfaces/window_manager_internal.mojom.h"
+#include "mojo/services/view_manager/interfaces/view_manager.mojom.h"
+#include "mojo/services/window_manager/interfaces/window_manager_internal.mojom.h"
#include "services/view_manager/connection_manager.h"
#include "services/view_manager/connection_manager_delegate.h"
diff --git a/services/view_manager/view_manager_service_apptest.cc b/services/view_manager/view_manager_service_apptest.cc
index dbf71b3..b368513 100644
--- a/services/view_manager/view_manager_service_apptest.cc
+++ b/services/view_manager/view_manager_service_apptest.cc
@@ -8,9 +8,9 @@
#include "mojo/public/cpp/application/application_delegate.h"
#include "mojo/public/cpp/application/application_impl.h"
#include "mojo/public/cpp/application/application_test_base.h"
-#include "mojo/services/view_manager/public/interfaces/view_manager.mojom.h"
-#include "mojo/services/window_manager/public/interfaces/window_manager.mojom.h"
-#include "mojo/services/window_manager/public/interfaces/window_manager_internal.mojom.h"
+#include "mojo/services/view_manager/interfaces/view_manager.mojom.h"
+#include "mojo/services/window_manager/interfaces/window_manager.mojom.h"
+#include "mojo/services/window_manager/interfaces/window_manager_internal.mojom.h"
#include "services/view_manager/ids.h"
#include "services/view_manager/test_change_tracker.h"
diff --git a/services/view_manager/view_manager_service_impl.cc b/services/view_manager/view_manager_service_impl.cc
index f2e0fca..e7df49b 100644
--- a/services/view_manager/view_manager_service_impl.cc
+++ b/services/view_manager/view_manager_service_impl.cc
@@ -10,7 +10,7 @@
#include "mojo/converters/geometry/geometry_type_converters.h"
#include "mojo/converters/input_events/input_events_type_converters.h"
#include "mojo/converters/surfaces/surfaces_type_converters.h"
-#include "mojo/services/window_manager/public/interfaces/window_manager_internal.mojom.h"
+#include "mojo/services/window_manager/interfaces/window_manager_internal.mojom.h"
#include "services/view_manager/connection_manager.h"
#include "services/view_manager/default_access_policy.h"
#include "services/view_manager/display_manager.h"
diff --git a/services/view_manager/view_manager_service_impl.h b/services/view_manager/view_manager_service_impl.h
index d4d7f81..e0ac507 100644
--- a/services/view_manager/view_manager_service_impl.h
+++ b/services/view_manager/view_manager_service_impl.h
@@ -13,7 +13,7 @@
#include "base/containers/hash_tables.h"
#include "base/memory/scoped_ptr.h"
#include "mojo/services/surfaces/interfaces/surface_id.mojom.h"
-#include "mojo/services/view_manager/public/interfaces/view_manager.mojom.h"
+#include "mojo/services/view_manager/interfaces/view_manager.mojom.h"
#include "services/view_manager/access_policy_delegate.h"
#include "services/view_manager/ids.h"
diff --git a/services/view_manager/view_manager_service_unittest.cc b/services/view_manager/view_manager_service_unittest.cc
index 7cc5975..5e23aa2 100644
--- a/services/view_manager/view_manager_service_unittest.cc
+++ b/services/view_manager/view_manager_service_unittest.cc
@@ -8,11 +8,11 @@
#include "base/message_loop/message_loop.h"
#include "mojo/converters/geometry/geometry_type_converters.h"
#include "mojo/public/interfaces/application/service_provider.mojom.h"
-#include "mojo/services/view_manager/public/cpp/types.h"
-#include "mojo/services/view_manager/public/cpp/util.h"
-#include "mojo/services/view_manager/public/interfaces/view_manager.mojom.h"
-#include "mojo/services/window_manager/public/interfaces/window_manager.mojom.h"
-#include "mojo/services/window_manager/public/interfaces/window_manager_internal.mojom.h"
+#include "mojo/services/view_manager/cpp/types.h"
+#include "mojo/services/view_manager/cpp/util.h"
+#include "mojo/services/view_manager/interfaces/view_manager.mojom.h"
+#include "mojo/services/window_manager/interfaces/window_manager.mojom.h"
+#include "mojo/services/window_manager/interfaces/window_manager_internal.mojom.h"
#include "services/view_manager/client_connection.h"
#include "services/view_manager/connection_manager.h"
#include "services/view_manager/connection_manager_delegate.h"
diff --git a/services/window_manager/BUILD.gn b/services/window_manager/BUILD.gn
index 55636ea..4f284a7 100644
--- a/services/window_manager/BUILD.gn
+++ b/services/window_manager/BUILD.gn
@@ -19,7 +19,7 @@
"//base",
"//mojo/application",
"//mojo/common:tracing_impl",
- "//mojo/services/view_manager/public/cpp",
+ "//mojo/services/view_manager/cpp",
]
}
@@ -66,8 +66,8 @@
"//mojo/public/cpp/bindings:bindings",
"//mojo/public/interfaces/application",
"//mojo/services/native_viewport/interfaces",
- "//mojo/services/view_manager/public/cpp",
- "//mojo/services/window_manager/public/interfaces",
+ "//mojo/services/view_manager/cpp",
+ "//mojo/services/window_manager/interfaces",
]
}
@@ -91,9 +91,9 @@
"//mojo/edk/system",
"//mojo/environment:chromium",
"//mojo/public/cpp/application",
- "//mojo/services/view_manager/public/cpp",
- "//mojo/services/view_manager/public/interfaces",
- "//mojo/services/window_manager/public/interfaces",
+ "//mojo/services/view_manager/cpp",
+ "//mojo/services/view_manager/interfaces",
+ "//mojo/services/window_manager/interfaces",
"//testing/gtest",
"//ui/events:test_support",
"//ui/gfx",
@@ -119,8 +119,8 @@
"//mojo/application:test_support",
"//mojo/environment:chromium",
"//mojo/public/cpp/system:system",
- "//mojo/services/view_manager/public/cpp",
- "//mojo/services/window_manager/public/interfaces",
+ "//mojo/services/view_manager/cpp",
+ "//mojo/services/window_manager/interfaces",
]
data_deps = [ ":window_manager($default_toolchain)" ]
diff --git a/services/window_manager/basic_focus_rules.cc b/services/window_manager/basic_focus_rules.cc
index 872f13d..862f3e4 100644
--- a/services/window_manager/basic_focus_rules.cc
+++ b/services/window_manager/basic_focus_rules.cc
@@ -5,7 +5,7 @@
#include "services/window_manager/basic_focus_rules.h"
#include "base/macros.h"
-#include "mojo/services/view_manager/public/cpp/view.h"
+#include "mojo/services/view_manager/cpp/view.h"
using mojo::View;
diff --git a/services/window_manager/capture_controller.cc b/services/window_manager/capture_controller.cc
index 5b6873e..b705677 100644
--- a/services/window_manager/capture_controller.cc
+++ b/services/window_manager/capture_controller.cc
@@ -4,8 +4,8 @@
#include "services/window_manager/capture_controller.h"
-#include "mojo/services/view_manager/public/cpp/view_property.h"
-#include "mojo/services/view_manager/public/cpp/view_tracker.h"
+#include "mojo/services/view_manager/cpp/view_property.h"
+#include "mojo/services/view_manager/cpp/view_tracker.h"
#include "services/window_manager/capture_controller_observer.h"
DECLARE_VIEW_PROPERTY_TYPE(window_manager::CaptureController*);
diff --git a/services/window_manager/capture_controller.h b/services/window_manager/capture_controller.h
index 9fa8b61..3e323c6 100644
--- a/services/window_manager/capture_controller.h
+++ b/services/window_manager/capture_controller.h
@@ -6,7 +6,7 @@
#define SERVICES_WINDOW_MANAGER_CAPTURE_CONTROLLER_H_
#include "base/observer_list.h"
-#include "mojo/services/view_manager/public/cpp/view_observer.h"
+#include "mojo/services/view_manager/cpp/view_observer.h"
namespace window_manager {
diff --git a/services/window_manager/focus_controller.cc b/services/window_manager/focus_controller.cc
index 71534e6..dd1ec6a 100644
--- a/services/window_manager/focus_controller.cc
+++ b/services/window_manager/focus_controller.cc
@@ -5,8 +5,8 @@
#include "services/window_manager/focus_controller.h"
#include "base/auto_reset.h"
-#include "mojo/services/view_manager/public/cpp/view_property.h"
-#include "mojo/services/view_manager/public/cpp/view_tracker.h"
+#include "mojo/services/view_manager/cpp/view_property.h"
+#include "mojo/services/view_manager/cpp/view_tracker.h"
#include "services/window_manager/focus_controller_observer.h"
#include "services/window_manager/focus_rules.h"
#include "services/window_manager/view_target.h"
diff --git a/services/window_manager/focus_controller.h b/services/window_manager/focus_controller.h
index dc2af10..a06ee2d 100644
--- a/services/window_manager/focus_controller.h
+++ b/services/window_manager/focus_controller.h
@@ -9,7 +9,7 @@
#include "base/memory/scoped_ptr.h"
#include "base/observer_list.h"
#include "base/scoped_observer.h"
-#include "mojo/services/view_manager/public/cpp/view_observer.h"
+#include "mojo/services/view_manager/cpp/view_observer.h"
#include "ui/events/event_handler.h"
namespace window_manager {
diff --git a/services/window_manager/focus_rules.h b/services/window_manager/focus_rules.h
index 48c4ea5..82567ba 100644
--- a/services/window_manager/focus_rules.h
+++ b/services/window_manager/focus_rules.h
@@ -5,8 +5,8 @@
#ifndef SERVICES_WINDOW_MANAGER_FOCUS_RULES_H_
#define SERVICES_WINDOW_MANAGER_FOCUS_RULES_H_
-#include "mojo/services/view_manager/public/cpp/types.h"
-#include "mojo/services/view_manager/public/cpp/view.h"
+#include "mojo/services/view_manager/cpp/types.h"
+#include "mojo/services/view_manager/cpp/view.h"
namespace window_manager {
diff --git a/services/window_manager/main.cc b/services/window_manager/main.cc
index bad0880..0a29bb4 100644
--- a/services/window_manager/main.cc
+++ b/services/window_manager/main.cc
@@ -8,8 +8,8 @@
#include "mojo/public/c/system/main.h"
#include "mojo/public/cpp/application/application_delegate.h"
#include "mojo/public/cpp/application/service_provider_impl.h"
-#include "mojo/services/view_manager/public/cpp/view_manager.h"
-#include "mojo/services/view_manager/public/cpp/view_manager_delegate.h"
+#include "mojo/services/view_manager/cpp/view_manager.h"
+#include "mojo/services/view_manager/cpp/view_manager_delegate.h"
#include "services/window_manager/basic_focus_rules.h"
#include "services/window_manager/window_manager_app.h"
#include "services/window_manager/window_manager_delegate.h"
diff --git a/services/window_manager/view_event_dispatcher.cc b/services/window_manager/view_event_dispatcher.cc
index 3a91a7f..5d2bc29 100644
--- a/services/window_manager/view_event_dispatcher.cc
+++ b/services/window_manager/view_event_dispatcher.cc
@@ -4,7 +4,7 @@
#include "services/window_manager/view_event_dispatcher.h"
-#include "mojo/services/view_manager/public/cpp/view.h"
+#include "mojo/services/view_manager/cpp/view.h"
#include "services/window_manager/view_target.h"
namespace window_manager {
diff --git a/services/window_manager/view_target.cc b/services/window_manager/view_target.cc
index 066e609..700515e 100644
--- a/services/window_manager/view_target.cc
+++ b/services/window_manager/view_target.cc
@@ -5,8 +5,8 @@
#include "services/window_manager/view_target.h"
#include "mojo/converters/geometry/geometry_type_converters.h"
-#include "mojo/services/view_manager/public/cpp/view.h"
-#include "mojo/services/view_manager/public/cpp/view_property.h"
+#include "mojo/services/view_manager/cpp/view.h"
+#include "mojo/services/view_manager/cpp/view_property.h"
#include "services/window_manager/view_targeter.h"
#include "services/window_manager/window_manager_app.h"
#include "ui/events/event.h"
diff --git a/services/window_manager/view_target_unittest.cc b/services/window_manager/view_target_unittest.cc
index c89ced0..9524759 100644
--- a/services/window_manager/view_target_unittest.cc
+++ b/services/window_manager/view_target_unittest.cc
@@ -6,7 +6,7 @@
#include <set>
-#include "mojo/services/view_manager/public/cpp/view.h"
+#include "mojo/services/view_manager/cpp/view.h"
#include "services/window_manager/window_manager_test_util.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/gfx/geometry/rect.h"
diff --git a/services/window_manager/window_manager_app.cc b/services/window_manager/window_manager_app.cc
index 42f4b29..b662c54 100644
--- a/services/window_manager/window_manager_app.cc
+++ b/services/window_manager/window_manager_app.cc
@@ -11,8 +11,8 @@
#include "mojo/public/cpp/application/application_connection.h"
#include "mojo/public/cpp/application/application_impl.h"
#include "mojo/public/interfaces/application/shell.mojom.h"
-#include "mojo/services/view_manager/public/cpp/view.h"
-#include "mojo/services/view_manager/public/cpp/view_manager.h"
+#include "mojo/services/view_manager/cpp/view.h"
+#include "mojo/services/view_manager/cpp/view_manager.h"
#include "services/window_manager/capture_controller.h"
#include "services/window_manager/focus_controller.h"
#include "services/window_manager/focus_rules.h"
diff --git a/services/window_manager/window_manager_app.h b/services/window_manager/window_manager_app.h
index 2bc9c38..a1e0c84 100644
--- a/services/window_manager/window_manager_app.h
+++ b/services/window_manager/window_manager_app.h
@@ -9,7 +9,7 @@
#include "mojo/public/cpp/application/application_connection.h"
#include "mojo/public/cpp/application/application_delegate.h"
#include "mojo/public/cpp/application/application_impl.h"
-#include "mojo/services/window_manager/public/interfaces/window_manager.mojom.h"
+#include "mojo/services/window_manager/interfaces/window_manager.mojom.h"
#include "services/window_manager/window_manager_delegate.h"
namespace window_manager {
diff --git a/services/window_manager/window_manager_apptest.cc b/services/window_manager/window_manager_apptest.cc
index 1f8519e..7eaa27c 100644
--- a/services/window_manager/window_manager_apptest.cc
+++ b/services/window_manager/window_manager_apptest.cc
@@ -9,10 +9,10 @@
#include "mojo/public/cpp/application/application_test_base.h"
#include "mojo/public/cpp/application/service_provider_impl.h"
#include "mojo/public/cpp/system/macros.h"
-#include "mojo/services/view_manager/public/cpp/view.h"
-#include "mojo/services/view_manager/public/cpp/view_manager_client_factory.h"
-#include "mojo/services/view_manager/public/cpp/view_manager_delegate.h"
-#include "mojo/services/window_manager/public/interfaces/window_manager.mojom.h"
+#include "mojo/services/view_manager/cpp/view.h"
+#include "mojo/services/view_manager/cpp/view_manager_client_factory.h"
+#include "mojo/services/view_manager/cpp/view_manager_delegate.h"
+#include "mojo/services/window_manager/interfaces/window_manager.mojom.h"
namespace mojo {
namespace {
diff --git a/services/window_manager/window_manager_delegate.h b/services/window_manager/window_manager_delegate.h
index fae3825..88ebb90 100644
--- a/services/window_manager/window_manager_delegate.h
+++ b/services/window_manager/window_manager_delegate.h
@@ -8,7 +8,7 @@
#include "base/memory/scoped_ptr.h"
#include "mojo/public/cpp/bindings/string.h"
#include "mojo/public/interfaces/application/service_provider.mojom.h"
-#include "mojo/services/view_manager/public/cpp/view_manager_delegate.h"
+#include "mojo/services/view_manager/cpp/view_manager_delegate.h"
namespace mojo {
class ApplicationConnection;
diff --git a/services/window_manager/window_manager_impl.cc b/services/window_manager/window_manager_impl.cc
index 428b356..16e71b4 100644
--- a/services/window_manager/window_manager_impl.cc
+++ b/services/window_manager/window_manager_impl.cc
@@ -5,7 +5,7 @@
#include "services/window_manager/window_manager_impl.h"
#include "base/bind.h"
-#include "mojo/services/view_manager/public/cpp/view.h"
+#include "mojo/services/view_manager/cpp/view.h"
#include "services/window_manager/capture_controller.h"
#include "services/window_manager/focus_controller.h"
#include "services/window_manager/window_manager_root.h"
diff --git a/services/window_manager/window_manager_impl.h b/services/window_manager/window_manager_impl.h
index ead432e..bf0c0ac 100644
--- a/services/window_manager/window_manager_impl.h
+++ b/services/window_manager/window_manager_impl.h
@@ -8,8 +8,8 @@
#include "base/logging.h"
#include "base/macros.h"
#include "mojo/public/cpp/bindings/binding.h"
-#include "mojo/services/view_manager/public/cpp/types.h"
-#include "mojo/services/window_manager/public/interfaces/window_manager.mojom.h"
+#include "mojo/services/view_manager/cpp/types.h"
+#include "mojo/services/window_manager/interfaces/window_manager.mojom.h"
namespace window_manager {
diff --git a/services/window_manager/window_manager_root.cc b/services/window_manager/window_manager_root.cc
index 6865dd7..4c15e43 100644
--- a/services/window_manager/window_manager_root.cc
+++ b/services/window_manager/window_manager_root.cc
@@ -15,8 +15,8 @@
#include "mojo/public/cpp/application/application_connection.h"
#include "mojo/public/cpp/application/application_impl.h"
#include "mojo/public/interfaces/application/shell.mojom.h"
-#include "mojo/services/view_manager/public/cpp/view.h"
-#include "mojo/services/view_manager/public/cpp/view_manager.h"
+#include "mojo/services/view_manager/cpp/view.h"
+#include "mojo/services/view_manager/cpp/view_manager.h"
#include "services/window_manager/capture_controller.h"
#include "services/window_manager/focus_controller.h"
#include "services/window_manager/focus_rules.h"
diff --git a/services/window_manager/window_manager_root.h b/services/window_manager/window_manager_root.h
index 14420e2..3b92420 100644
--- a/services/window_manager/window_manager_root.h
+++ b/services/window_manager/window_manager_root.h
@@ -11,11 +11,11 @@
#include "mojo/public/cpp/application/interface_factory_impl.h"
#include "mojo/public/cpp/bindings/binding.h"
#include "mojo/public/cpp/bindings/string.h"
-#include "mojo/services/view_manager/public/cpp/types.h"
-#include "mojo/services/view_manager/public/cpp/view_manager_client_factory.h"
-#include "mojo/services/view_manager/public/cpp/view_manager_delegate.h"
-#include "mojo/services/view_manager/public/cpp/view_observer.h"
-#include "mojo/services/window_manager/public/interfaces/window_manager_internal.mojom.h"
+#include "mojo/services/view_manager/cpp/types.h"
+#include "mojo/services/view_manager/cpp/view_manager_client_factory.h"
+#include "mojo/services/view_manager/cpp/view_manager_delegate.h"
+#include "mojo/services/view_manager/cpp/view_observer.h"
+#include "mojo/services/window_manager/interfaces/window_manager_internal.mojom.h"
#include "services/window_manager/capture_controller_observer.h"
#include "services/window_manager/focus_controller_observer.h"
#include "services/window_manager/native_viewport_event_dispatcher_impl.h"
diff --git a/services/window_manager/window_manager_test_util.h b/services/window_manager/window_manager_test_util.h
index 87f5709..fc26bd1 100644
--- a/services/window_manager/window_manager_test_util.h
+++ b/services/window_manager/window_manager_test_util.h
@@ -7,8 +7,8 @@
#include <set>
-#include "mojo/services/view_manager/public/cpp/lib/view_private.h"
-#include "mojo/services/view_manager/public/cpp/view.h"
+#include "mojo/services/view_manager/cpp/lib/view_private.h"
+#include "mojo/services/view_manager/cpp/view.h"
#include "services/window_manager/view_target.h"
namespace gfx {
diff --git a/shell/BUILD.gn b/shell/BUILD.gn
index 774a6d3..51e7daf 100644
--- a/shell/BUILD.gn
+++ b/shell/BUILD.gn
@@ -76,7 +76,7 @@
":jni_headers",
"//gpu/config",
"//mojo/android:libsystem_java",
- "//mojo/services/window_manager/public/interfaces:interfaces",
+ "//mojo/services/window_manager/interfaces:interfaces",
"//services/native_viewport:lib",
"//shell/application_manager",
"//ui/gl",
diff --git a/shell/android/main.cc b/shell/android/main.cc
index 92d4bb3..79f3491 100644
--- a/shell/android/main.cc
+++ b/shell/android/main.cc
@@ -27,7 +27,7 @@
#include "jni/ShellService_jni.h"
#include "mojo/message_pump/message_pump_mojo.h"
#include "mojo/services/network/public/interfaces/network_service.mojom.h"
-#include "mojo/services/window_manager/public/interfaces/window_manager.mojom.h"
+#include "mojo/services/window_manager/interfaces/window_manager.mojom.h"
#include "shell/android/android_handler_loader.h"
#include "shell/android/java_application_loader.h"
#include "shell/android/native_viewport_application_loader.h"
