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

Side by Side Diff: ui/ui.gyp

Issue 10316013: linux: Move linux_util.h from gfx/ to ui/base/gtk. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: LinuxUtilTest -> MenuLabelAcceleratorTest Created 8 years, 7 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 | Annotate | Revision Log
« no previous file with comments | « ui/gfx/linux_util_unittest.cc ('k') | ui/ui_unittests.gypi » ('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 (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'includes': [ 9 'includes': [
10 'ui_resources.gypi', 10 'ui_resources.gypi',
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 'base/gtk/gtk_im_context_util.cc', 156 'base/gtk/gtk_im_context_util.cc',
157 'base/gtk/gtk_im_context_util.h', 157 'base/gtk/gtk_im_context_util.h',
158 'base/gtk/gtk_hig_constants.h', 158 'base/gtk/gtk_hig_constants.h',
159 'base/gtk/gtk_screen_util.cc', 159 'base/gtk/gtk_screen_util.cc',
160 'base/gtk/gtk_screen_util.h', 160 'base/gtk/gtk_screen_util.h',
161 'base/gtk/gtk_signal.h', 161 'base/gtk/gtk_signal.h',
162 'base/gtk/gtk_signal_registrar.cc', 162 'base/gtk/gtk_signal_registrar.cc',
163 'base/gtk/gtk_signal_registrar.h', 163 'base/gtk/gtk_signal_registrar.h',
164 'base/gtk/gtk_windowing.cc', 164 'base/gtk/gtk_windowing.cc',
165 'base/gtk/gtk_windowing.h', 165 'base/gtk/gtk_windowing.h',
166 'base/gtk/menu_label_accelerator_util.cc',
167 'base/gtk/menu_label_accelerator_util.h',
166 'base/gtk/owned_widget_gtk.cc', 168 'base/gtk/owned_widget_gtk.cc',
167 'base/gtk/owned_widget_gtk.h', 169 'base/gtk/owned_widget_gtk.h',
168 'base/gtk/scoped_gobject.h', 170 'base/gtk/scoped_gobject.h',
169 'base/gtk/scoped_region.cc', 171 'base/gtk/scoped_region.cc',
170 'base/gtk/scoped_region.h', 172 'base/gtk/scoped_region.h',
171 'base/hit_test.h', 173 'base/hit_test.h',
172 'base/javascript_message_type.h', 174 'base/javascript_message_type.h',
173 'base/keycodes/keyboard_code_conversion.cc', 175 'base/keycodes/keyboard_code_conversion.cc',
174 'base/keycodes/keyboard_code_conversion.h', 176 'base/keycodes/keyboard_code_conversion.h',
175 'base/keycodes/keyboard_code_conversion_gtk.cc', 177 'base/keycodes/keyboard_code_conversion_gtk.cc',
(...skipping 304 matching lines...) Expand 10 before | Expand all | Expand 10 after
480 ['use_glib == 1', { 482 ['use_glib == 1', {
481 'dependencies': [ 483 'dependencies': [
482 # font_gtk.cc uses fontconfig. 484 # font_gtk.cc uses fontconfig.
483 '../build/linux/system.gyp:fontconfig', 485 '../build/linux/system.gyp:fontconfig',
484 '../build/linux/system.gyp:glib', 486 '../build/linux/system.gyp:glib',
485 '../build/linux/system.gyp:pangocairo', 487 '../build/linux/system.gyp:pangocairo',
486 '../build/linux/system.gyp:x11', 488 '../build/linux/system.gyp:x11',
487 '../build/linux/system.gyp:xext', 489 '../build/linux/system.gyp:xext',
488 '../build/linux/system.gyp:xfixes', 490 '../build/linux/system.gyp:xfixes',
489 ], 491 ],
490 'sources': [
491 'gfx/linux_util.cc',
492 'gfx/linux_util.h',
493 ],
494 'link_settings': { 492 'link_settings': {
495 'libraries': [ 493 'libraries': [
496 '-lXrender', # For XRender* function calls in x11_util.cc. 494 '-lXrender', # For XRender* function calls in x11_util.cc.
497 ], 495 ],
498 }, 496 },
499 'conditions': [ 497 'conditions': [
500 ['toolkit_views==0', { 498 ['toolkit_views==0', {
501 # Note: because of gyp predence rules this has to be defined as 499 # Note: because of gyp predence rules this has to be defined as
502 # 'sources/' rather than 'sources!'. 500 # 'sources/' rather than 'sources!'.
503 'sources/': [ 501 'sources/': [
(...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after
743 'shutil.copyfile(\'<(ui_copy_target)\', \'<(ui_copy_dest)\'); ' \ 741 'shutil.copyfile(\'<(ui_copy_target)\', \'<(ui_copy_dest)\'); ' \
744 'os.chmod(\'<(ui_copy_dest)\', 0700)' 742 'os.chmod(\'<(ui_copy_dest)\', 0700)'
745 ] 743 ]
746 } 744 }
747 ], 745 ],
748 }, 746 },
749 ], 747 ],
750 }], 748 }],
751 ], 749 ],
752 } 750 }
OLDNEW
« no previous file with comments | « ui/gfx/linux_util_unittest.cc ('k') | ui/ui_unittests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698