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

Side by Side Diff: ui/views/BUILD.gn

Issue 927233003: MacViews: Fix positioning of top-level Widgets with parents (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@20150129-MacViews-Bringup5
Patch Set: Added comment to BridgedNativeWidget Created 5 years, 10 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 | ui/views/cocoa/bridged_native_widget.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/features.gni") 5 import("//build/config/features.gni")
6 import("//build/config/ui.gni") 6 import("//build/config/ui.gni")
7 import("//testing/test.gni") 7 import("//testing/test.gni")
8 8
9 gypi_values = exec_script("//build/gypi_to_gn.py", 9 gypi_values = exec_script("//build/gypi_to_gn.py",
10 [ rebase_path("views.gyp") ], 10 [ rebase_path("views.gyp") ],
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 "//ui/events/platform", 186 "//ui/events/platform",
187 "//ui/gfx", 187 "//ui/gfx",
188 "//ui/gfx/geometry", 188 "//ui/gfx/geometry",
189 "//ui/gl", 189 "//ui/gl",
190 "//ui/resources", 190 "//ui/resources",
191 "//ui/strings", 191 "//ui/strings",
192 "//ui/wm", 192 "//ui/wm",
193 "//url", 193 "//url",
194 ] 194 ]
195 195
196 if (is_chromeos) {
197 sources -= [ "ime/input_method_bridge_unittest.cc" ]
198 }
199
200 if (is_win) { 196 if (is_win) {
201 deps += [ 197 deps += [
202 "//third_party/iaccessible2", 198 "//third_party/iaccessible2",
203 "//third_party/wtl", 199 "//third_party/wtl",
204 ] 200 ]
205 libs = [ 201 libs = [
206 "imm32.lib", 202 "imm32.lib",
207 "oleacc.lib", 203 "oleacc.lib",
208 "comctl32.lib", 204 "comctl32.lib",
209 ] 205 ]
(...skipping 23 matching lines...) Expand all
233 if (use_aura) { 229 if (use_aura) {
234 sources += gypi_values.views_unittests_aura_sources 230 sources += gypi_values.views_unittests_aura_sources
235 deps += [ "//ui/aura:test_support" ] 231 deps += [ "//ui/aura:test_support" ]
236 if (!is_chromeos) { 232 if (!is_chromeos) {
237 sources += gypi_values.views_unittests_desktop_aura_sources 233 sources += gypi_values.views_unittests_desktop_aura_sources
238 if (use_x11) { 234 if (use_x11) {
239 sources += gypi_values.views_unittests_desktop_aurax11_sources 235 sources += gypi_values.views_unittests_desktop_aurax11_sources
240 } 236 }
241 } 237 }
242 } 238 }
239 if (!is_chromeos) {
240 sources += gypi_values.views_unittests_desktop_sources
241 }
243 if (use_x11) { 242 if (use_x11) {
244 deps += [ 243 deps += [
245 "//ui/events/platform/x11", 244 "//ui/events/platform/x11",
246 "//ui/gfx/x", 245 "//ui/gfx/x",
247 ] 246 ]
248 } 247 }
249 248
250 if (is_mac) { 249 if (is_mac) {
251 # views_unittests not yet compiling on Mac. http://crbug.com/378134 250 # views_unittests not yet compiling on Mac. http://crbug.com/378134
252 sources -= [ 251 sources -= [
(...skipping 27 matching lines...) Expand all
280 "//testing/gtest", 279 "//testing/gtest",
281 "//ui/aura", 280 "//ui/aura",
282 "//ui/compositor", 281 "//ui/compositor",
283 "//ui/resources", 282 "//ui/resources",
284 "//ui/resources:ui_test_pak", 283 "//ui/resources:ui_test_pak",
285 "//ui/strings", 284 "//ui/strings",
286 "//ui/wm", 285 "//ui/wm",
287 ] 286 ]
288 } 287 }
289 } 288 }
OLDNEW
« no previous file with comments | « no previous file | ui/views/cocoa/bridged_native_widget.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698