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/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"
