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

Side by Side Diff: services/ui/ws/BUILD.gn

Issue 2121053002: Have PlatformScreen use DisplayConfigurator. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix cast for real. Created 4 years, 5 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 unified diff | Download patch
« no previous file with comments | « no previous file | services/ui/ws/platform_screen.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import("//build/config/ui.gni") 5 import("//build/config/ui.gni")
6 import("//testing/test.gni") 6 import("//testing/test.gni")
7 import("//mojo/public/mojo_application.gni") 7 import("//mojo/public/mojo_application.gni")
8 import("//mojo/public/mojo_application_manifest.gni") 8 import("//mojo/public/mojo_application_manifest.gni")
9 9
10 source_set("lib") { 10 source_set("lib") {
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 "//ui/gfx", 123 "//ui/gfx",
124 "//ui/gfx/geometry", 124 "//ui/gfx/geometry",
125 "//ui/gfx/geometry/mojo", 125 "//ui/gfx/geometry/mojo",
126 "//ui/gl", 126 "//ui/gl",
127 "//ui/platform_window", 127 "//ui/platform_window",
128 "//ui/platform_window:platform_impls", 128 "//ui/platform_window:platform_impls",
129 "//ui/platform_window/mojo", 129 "//ui/platform_window/mojo",
130 ] 130 ]
131 131
132 if (use_ozone) { 132 if (use_ozone) {
133 sources -= [ 133 if (is_chromeos) {
134 "platform_screen_impl.cc", 134 sources -= [
135 "platform_screen_impl.h", 135 "platform_screen_impl.cc",
136 ] 136 "platform_screen_impl.h",
137 sources += [ 137 ]
138 "platform_screen_impl_ozone.cc", 138 sources += [
139 "platform_screen_impl_ozone.h", 139 "platform_screen_impl_ozone.cc",
140 ] 140 "platform_screen_impl_ozone.h",
141 ]
142 }
143
141 public_deps += [ "//ui/ozone:ozone" ] 144 public_deps += [ "//ui/ozone:ozone" ]
142 } 145 }
143 } 146 }
144 147
145 source_set("test_interface") { 148 source_set("test_interface") {
146 sources = [ 149 sources = [
147 "window_server_test_impl.cc", 150 "window_server_test_impl.cc",
148 "window_server_test_impl.h", 151 "window_server_test_impl.h",
149 ] 152 ]
150 153
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
245 248
246 data_deps = [ 249 data_deps = [
247 ":mus_ws_unittests_app_manifest", 250 ":mus_ws_unittests_app_manifest",
248 ] 251 ]
249 } 252 }
250 253
251 mojo_application_manifest("mus_ws_unittests_app_manifest") { 254 mojo_application_manifest("mus_ws_unittests_app_manifest") {
252 application_name = "mus_ws_unittests_app" 255 application_name = "mus_ws_unittests_app"
253 source = "mus_ws_unittests_app_manifest.json" 256 source = "mus_ws_unittests_app_manifest.json"
254 } 257 }
OLDNEW
« no previous file with comments | « no previous file | services/ui/ws/platform_screen.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698