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

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

Issue 2160133002: Revert of Support for retreiving the monitor color space on X11. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 | ui/gfx/color_space.cc » ('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 7
8 if (is_android) { 8 if (is_android) {
9 import("//build/config/android/config.gni") 9 import("//build/config/android/config.gni")
10 import("//build/config/android/rules.gni") 10 import("//build/config/android/rules.gni")
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 "codec/jpeg_codec.h", 59 "codec/jpeg_codec.h",
60 "codec/png_codec.cc", 60 "codec/png_codec.cc",
61 "codec/png_codec.h", 61 "codec/png_codec.h",
62 "color_analysis.cc", 62 "color_analysis.cc",
63 "color_analysis.h", 63 "color_analysis.h",
64 "color_palette.h", 64 "color_palette.h",
65 "color_space.cc", 65 "color_space.cc",
66 "color_space.h", 66 "color_space.h",
67 "color_space_mac.mm", 67 "color_space_mac.mm",
68 "color_space_win.cc", 68 "color_space_win.cc",
69 "color_space_x11.cc",
70 "color_utils.cc", 69 "color_utils.cc",
71 "color_utils.h", 70 "color_utils.h",
72 "favicon_size.cc", 71 "favicon_size.cc",
73 "favicon_size.h", 72 "favicon_size.h",
74 "font.cc", 73 "font.cc",
75 "font.h", 74 "font.h",
76 "font_fallback.h", 75 "font_fallback.h",
77 "font_fallback_linux.cc", 76 "font_fallback_linux.cc",
78 "font_fallback_linux.h", 77 "font_fallback_linux.h",
79 "font_fallback_mac.mm", 78 "font_fallback_mac.mm",
(...skipping 315 matching lines...) Expand 10 before | Expand all | Expand 10 after
395 "nine_image_painter.cc", 394 "nine_image_painter.cc",
396 "nine_image_painter.h", 395 "nine_image_painter.h",
397 ] 396 ]
398 } 397 }
399 } 398 }
400 399
401 if (use_x11) { 400 if (use_x11) {
402 deps += [ "//ui/gfx/x" ] 401 deps += [ "//ui/gfx/x" ]
403 configs += [ "//build/config/linux:x11" ] 402 configs += [ "//build/config/linux:x11" ]
404 } else { 403 } else {
405 sources -= [ 404 sources -= [ "path_x11.cc" ]
406 "color_space_x11.cc",
407 "path_x11.cc",
408 ]
409 } 405 }
410 406
411 if (use_cairo) { 407 if (use_cairo) {
412 configs += [ "//build/config/linux/pangocairo" ] 408 configs += [ "//build/config/linux/pangocairo" ]
413 } 409 }
414 } 410 }
415 411
416 # GYP version: ui/gfx/gfx.gyp:aggregate_vector_icons 412 # GYP version: ui/gfx/gfx.gyp:aggregate_vector_icons
417 action("aggregate_vector_icons") { 413 action("aggregate_vector_icons") {
418 script = "vector_icons/aggregate_vector_icons.py" 414 script = "vector_icons/aggregate_vector_icons.py"
(...skipping 477 matching lines...) Expand 10 before | Expand all | Expand 10 after
896 if (is_android) { 892 if (is_android) {
897 generate_jni("gfx_jni_headers") { 893 generate_jni("gfx_jni_headers") {
898 sources = [ 894 sources = [
899 "../android/java/src/org/chromium/ui/gfx/BitmapHelper.java", 895 "../android/java/src/org/chromium/ui/gfx/BitmapHelper.java",
900 "../android/java/src/org/chromium/ui/gfx/DeviceDisplayInfo.java", 896 "../android/java/src/org/chromium/ui/gfx/DeviceDisplayInfo.java",
901 "../android/java/src/org/chromium/ui/gfx/ViewConfigurationHelper.java", 897 "../android/java/src/org/chromium/ui/gfx/ViewConfigurationHelper.java",
902 ] 898 ]
903 jni_package = "gfx" 899 jni_package = "gfx"
904 } 900 }
905 } 901 }
OLDNEW
« no previous file with comments | « no previous file | ui/gfx/color_space.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698