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

Unified Diff: mojo/services/view_manager/BUILD.gn

Issue 568883003: Second attempt to land change to remove NativeViewportService and (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: mojo/services/view_manager/BUILD.gn
diff --git a/mojo/services/view_manager/BUILD.gn b/mojo/services/view_manager/BUILD.gn
index 21b2796638cf08c7d0acf4033ede994c85cd2f0c..3cc385343d1eccaed681899d9b84e559753a426a 100644
--- a/mojo/services/view_manager/BUILD.gn
+++ b/mojo/services/view_manager/BUILD.gn
@@ -2,6 +2,8 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+import("//build/config/ui.gni")
+
# GYP version: mojo/mojo_services.gypi:mojo_view_manager
component("view_manager") {
deps = [
@@ -40,7 +42,6 @@ component("view_manager") {
"default_access_policy.h",
"display_manager.cc",
"display_manager.h",
- "ids.h",
"main.cc",
"server_view.cc",
"server_view.h",
@@ -65,19 +66,24 @@ test("mojo_view_manager_unittests") {
"//mojo/application",
"//mojo/application_manager",
"//mojo/environment:chromium",
- "//mojo/services/public/cpp/input_events",
"//mojo/services/public/cpp/geometry",
"//mojo/services/public/cpp/view_manager",
"//mojo/services/public/cpp/view_manager/lib:run_unittests",
"//mojo/services/public/cpp/view_manager:common",
- "//mojo/services/public/interfaces/input_events",
- "//mojo/services/public/interfaces/geometry",
- "//mojo/services/public/interfaces/view_manager",
"//mojo/shell:test_support",
"//mojo/system",
"//testing/gtest",
+ "//ui/gfx/geometry",
]
+ if (use_x11) {
+ deps += ["//ui/gfx/x"]
+ }
+
+ if (is_component_build) {
+ deps += ["//ui/gl"]
+ }
+
sources = [
"test_change_tracker.cc",
"test_change_tracker.h",
« no previous file with comments | « mojo/services/public/interfaces/native_viewport/native_viewport.mojom ('k') | mojo/services/view_manager/ids.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698