Chromium Code Reviews| Index: content/content_common.gypi |
| diff --git a/content/content_common.gypi b/content/content_common.gypi |
| index 0fc835e4cae1c02b79b8050ee9f82899867b94cc..5e4815f3b38fce66c190ac5b4ec7ffe6162923dc 100644 |
| --- a/content/content_common.gypi |
| +++ b/content/content_common.gypi |
| @@ -325,8 +325,7 @@ |
| 'common/font_list.h', |
| 'common/font_list_android.cc', |
| 'common/font_list_mac.mm', |
| - 'common/font_list_ozone.cc', |
| - 'common/font_list_pango.cc', |
| + 'common/font_list_fontconfig.cc', |
|
Daniel Erat
2016/08/25 13:49:57
nit: keep this alphabetized
|
| 'common/font_list_win.cc', |
| 'common/frame_message_enums.h', |
| 'common/frame_messages.h', |
| @@ -578,14 +577,6 @@ |
| 'content.gyp:common_aidl', |
| ], |
| }], |
| - ['use_pango == 1', { |
| - 'dependencies': [ |
| - '../build/linux/system.gyp:pangocairo', |
| - ], |
| - 'sources!': [ |
| - 'common/font_list_ozone.cc', |
| - ], |
| - }], |
| ['use_x11 == 1', { |
| 'include_dirs': [ |
| '<(DEPTH)/third_party/khronos', |
| @@ -652,7 +643,6 @@ |
| }, { # use_ozone!=1 |
| 'sources!': [ |
| 'common/cursors/webcursor_ozone.cc', |
| - 'common/font_list_ozone.cc', |
| 'common/gpu/gpu_memory_buffer_factory_ozone.cc', |
| 'common/gpu/gpu_memory_buffer_factory_ozone_native_pixmap.cc', |
| 'common/gpu/gpu_memory_buffer_factory_ozone_native_pixmap.h', |