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

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

Issue 718573002: Revert "Remove aura and make a pure mojo::View version of the aura::Window FocusController." (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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/window_manager/BUILD.gn
diff --git a/mojo/services/window_manager/BUILD.gn b/mojo/services/window_manager/BUILD.gn
index 633e03387956056d84d2d0359a9ac1cd8c82d00f..751c97c3cfc099338b50cb40cc1ee11c78221311 100644
--- a/mojo/services/window_manager/BUILD.gn
+++ b/mojo/services/window_manager/BUILD.gn
@@ -4,6 +4,8 @@
import("//build/config/ui.gni")
+if (use_aura) {
+
# GYP version: mojo/mojo_services.gypi:mojo_core_window_manager
shared_library("window_manager") {
sources = [ "main.cc" ]
@@ -23,12 +25,6 @@ shared_library("window_manager") {
# GYP version: mojo/mojo_services.gypi:mojo_core_window_manager_lib
source_set("lib") {
sources = [
- "basic_focus_rules.cc",
- "basic_focus_rules.h",
- "focus_controller.cc",
- "focus_controller.h",
- "focus_controller_observer.h",
- "focus_rules.h",
"native_viewport_event_dispatcher_impl.cc",
"native_viewport_event_dispatcher_impl.h",
"window_manager_app.cc",
@@ -36,12 +32,10 @@ source_set("lib") {
"window_manager_delegate.h",
"window_manager_impl.cc",
"window_manager_impl.h",
- "view_event_dispatcher.cc",
- "view_event_dispatcher.h",
- "view_target.cc",
- "view_target.h",
- "view_targeter.cc",
- "view_targeter.h",
+ ]
+
+ public_deps = [
+ "//mojo/aura",
]
deps = [
@@ -50,6 +44,7 @@ source_set("lib") {
"//ui/gfx",
"//ui/gfx/geometry",
"//ui/wm",
+ "//mojo/aura",
"//mojo/application",
"//mojo/common",
"//mojo/converters/input_events",
@@ -84,3 +79,5 @@ test("window_manager_unittests") {
deps += [ "//ui/gfx/x" ]
}
}
+
+} # use_aura
« no previous file with comments | « mojo/services/public/cpp/view_manager/view_tracker.cc ('k') | mojo/services/window_manager/basic_focus_rules.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698