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

Side by Side Diff: ui/ui.gyp

Issue 7942004: Consolidate/cleanup event cracking code; single out GdkEvents. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix GdkEvent init, NativeWidgetGtk casting, and Get[Unmodified]Character checks. Created 9 years, 2 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
OLDNEW
1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 'toolkit_views2': 0, # ui/views/ is an experimental framework on Windows. 8 'toolkit_views2': 0, # ui/views/ is an experimental framework on Windows.
9 }, 9 },
10 'target_defaults': { 10 'target_defaults': {
11 'conditions': [ 11 'conditions': [
12 ['OS=="win"', 12 ['OS=="win"',
13 {'variables': {'toolkit_views2': 1}}, 13 {'variables': {'toolkit_views2': 1}},
14 ], 14 ],
15 ['toolkit_views2==0', {'sources/': [ 15 ['toolkit_views2==0', {'sources/': [
16 ['exclude', 'views/'], 16 ['exclude', 'views/'],
17 ]}], 17 ]}],
18 ['touchui==0', {'sources/': [ 18 ['touchui==0', {'sources/': [
19 ['exclude', 'event_x.cc$'],
20 ['exclude', 'native_menu_x.cc$'],
21 ['exclude', 'native_menu_x.h$'],
22 ['exclude', 'touchui/'],
23 ['exclude', '_(touch)\\.cc$'], 19 ['exclude', '_(touch)\\.cc$'],
24 ]}], 20 ]}],
25 ], 21 ],
26 }, 22 },
27 'includes': [ 23 'includes': [
28 'ui_resources.gypi', 24 'ui_resources.gypi',
29 ], 25 ],
30 'targets': [ 26 'targets': [
31 { 27 {
32 'target_name': 'ui', 28 'target_name': 'ui',
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
181 'base/resource/resource_bundle_linux.cc', 177 'base/resource/resource_bundle_linux.cc',
182 'base/resource/resource_bundle_mac.mm', 178 'base/resource/resource_bundle_mac.mm',
183 'base/resource/resource_bundle_posix.cc', 179 'base/resource/resource_bundle_posix.cc',
184 'base/resource/resource_bundle_win.cc', 180 'base/resource/resource_bundle_win.cc',
185 'base/text/bytes_formatting.cc', 181 'base/text/bytes_formatting.cc',
186 'base/text/bytes_formatting.h', 182 'base/text/bytes_formatting.h',
187 'base/text/text_elider.cc', 183 'base/text/text_elider.cc',
188 'base/text/text_elider.h', 184 'base/text/text_elider.h',
189 'base/theme_provider.cc', 185 'base/theme_provider.cc',
190 'base/theme_provider.h', 186 'base/theme_provider.h',
187 'base/touchui/touch_factory.cc',
188 'base/touchui/touch_factory.h',
191 'base/ui_base_exports.cc', 189 'base/ui_base_exports.cc',
192 'base/ui_base_paths.cc', 190 'base/ui_base_paths.cc',
193 'base/ui_base_paths.h', 191 'base/ui_base_paths.h',
194 'base/ui_base_switches.cc', 192 'base/ui_base_switches.cc',
195 'base/ui_base_switches.h', 193 'base/ui_base_switches.h',
196 'base/ui_base_types.h', 194 'base/ui_base_types.h',
197 'base/ui_export.h', 195 'base/ui_export.h',
198 'base/view_prop.cc', 196 'base/view_prop.cc',
199 'base/view_prop.h', 197 'base/view_prop.h',
198 'base/wayland/events_wayland.cc',
199 'base/win/events_win.cc',
200 'base/win/hwnd_util.cc', 200 'base/win/hwnd_util.cc',
201 'base/win/hwnd_util.h', 201 'base/win/hwnd_util.h',
202 'base/win/ime_input.cc', 202 'base/win/ime_input.cc',
203 'base/win/ime_input.h', 203 'base/win/ime_input.h',
204 'base/win/mouse_wheel_util.cc', 204 'base/win/mouse_wheel_util.cc',
205 'base/win/mouse_wheel_util.h', 205 'base/win/mouse_wheel_util.h',
206 'base/win/shell.cc', 206 'base/win/shell.cc',
207 'base/win/shell.h', 207 'base/win/shell.h',
208 'base/win/window_impl.cc', 208 'base/win/window_impl.cc',
209 'base/win/window_impl.h', 209 'base/win/window_impl.h',
210 'base/x/active_window_watcher_x.cc', 210 'base/x/active_window_watcher_x.cc',
211 'base/x/active_window_watcher_x.h', 211 'base/x/active_window_watcher_x.h',
212 'base/x/events_x.cc',
212 'base/x/x11_util.cc', 213 'base/x/x11_util.cc',
213 'base/x/x11_util.h', 214 'base/x/x11_util.h',
214 'base/x/x11_util_internal.h', 215 'base/x/x11_util_internal.h',
215 'gfx/blit.cc', 216 'gfx/blit.cc',
216 'gfx/blit.h', 217 'gfx/blit.h',
217 'gfx/brush.h', 218 'gfx/brush.h',
218 'gfx/canvas.cc', 219 'gfx/canvas.cc',
219 'gfx/canvas.h', 220 'gfx/canvas.h',
220 'gfx/canvas_skia.h', 221 'gfx/canvas_skia.h',
221 'gfx/canvas_skia.cc', 222 'gfx/canvas_skia.cc',
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
395 'gfx/gdi_util.h', 396 'gfx/gdi_util.h',
396 'gfx/icon_util.cc', 397 'gfx/icon_util.cc',
397 'gfx/icon_util.h', 398 'gfx/icon_util.h',
398 'gfx/native_theme_win.cc', 399 'gfx/native_theme_win.cc',
399 'gfx/native_theme_win.h', 400 'gfx/native_theme_win.h',
400 'gfx/win_util.cc', 401 'gfx/win_util.cc',
401 'gfx/win_util.h', 402 'gfx/win_util.h',
402 ], 403 ],
403 'sources!': [ 404 'sources!': [
404 'base/clipboard/clipboard_aura.cc', 405 'base/clipboard/clipboard_aura.cc',
406 'base/touchui/touch_factory.cc',
407 'base/touchui/touch_factory.h',
405 'gfx/pango_util.h', 408 'gfx/pango_util.h',
406 'gfx/pango_util.cc', 409 'gfx/pango_util.cc',
407 'gfx/platform_font_pango.cc', 410 'gfx/platform_font_pango.cc',
408 'gfx/platform_font_pango.h', 411 'gfx/platform_font_pango.h',
409 ], 412 ],
410 'include_dirs': [ 413 'include_dirs': [
411 '../', 414 '../',
412 '../third_party/wtl/include', 415 '../third_party/wtl/include',
413 ], 416 ],
414 'msvs_settings': { 417 'msvs_settings': {
(...skipping 25 matching lines...) Expand all
440 'base/dragdrop/os_exchange_data.cc', 443 'base/dragdrop/os_exchange_data.cc',
441 'base/view_prop.cc', 444 'base/view_prop.cc',
442 'base/view_prop.h', 445 'base/view_prop.h',
443 ], 446 ],
444 'sources/': [ 447 'sources/': [
445 ['exclude', '^base/win/*'], 448 ['exclude', '^base/win/*'],
446 ], 449 ],
447 }], 450 }],
448 ['OS=="mac"', { 451 ['OS=="mac"', {
449 'sources!': [ 452 'sources!': [
453 'base/touchui/touch_factory.cc',
454 'base/touchui/touch_factory.h',
450 'gfx/pango_util.h', 455 'gfx/pango_util.h',
451 'gfx/pango_util.cc', 456 'gfx/pango_util.cc',
452 'gfx/platform_font_pango.h', 457 'gfx/platform_font_pango.h',
453 'gfx/platform_font_pango.cc', 458 'gfx/platform_font_pango.cc',
454 ], 459 ],
455 'link_settings': { 460 'link_settings': {
456 'libraries': [ 461 'libraries': [
457 '$(SDKROOT)/System/Library/Frameworks/Accelerate.framework', 462 '$(SDKROOT)/System/Library/Frameworks/Accelerate.framework',
458 '$(SDKROOT)/System/Library/Frameworks/AudioUnit.framework', 463 '$(SDKROOT)/System/Library/Frameworks/AudioUnit.framework',
459 ], 464 ],
460 }, 465 },
461 }], 466 }],
462 ['use_x11==1', { 467 ['use_x11==1', {
463 'all_dependent_settings': { 468 'all_dependent_settings': {
464 'ldflags': [ 469 'ldflags': [
465 '-L<(PRODUCT_DIR)', 470 '-L<(PRODUCT_DIR)',
466 ], 471 ],
467 'link_settings': { 472 'link_settings': {
468 'libraries': [ 473 'libraries': [
469 '-lX11', 474 '-lX11',
470 '-ldl', 475 '-ldl',
471 ], 476 ],
472 }, 477 },
473 }, 478 },
474 }, { # use_x11==0 479 }, { # use_x11==0
475 'sources!': [ 480 'sources!': [
476 'base/keycodes/keyboard_code_conversion_x.cc', 481 'base/keycodes/keyboard_code_conversion_x.cc',
477 'base/keycodes/keyboard_code_conversion_x.h', 482 'base/keycodes/keyboard_code_conversion_x.h',
483 'base/x/active_window_watcher_x.cc',
484 'base/x/active_window_watcher_x.h',
485 'base/x/events_x.cc',
486 'base/x/x11_util.cc',
487 'base/x/x11_util.h',
488 'base/x/x11_util_internal.h',
478 ], 489 ],
479 }], 490 }],
480 ['chromeos==1', { 491 ['chromeos==1', {
481 'sources': [ 492 'sources': [
482 'gfx/native_theme_chromeos.cc', 493 'gfx/native_theme_chromeos.cc',
483 'gfx/native_theme_chromeos.h', 494 'gfx/native_theme_chromeos.h',
484 ], 495 ],
485 }], 496 }],
486 ['toolkit_views==0', { 497 ['toolkit_views==0', {
487 'sources!': [ 498 'sources!': [
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
548 'shutil.copyfile(\'<(ui_copy_target)\', \'<(ui_copy_dest)\'); ' \ 559 'shutil.copyfile(\'<(ui_copy_target)\', \'<(ui_copy_dest)\'); ' \
549 'os.chmod(\'<(ui_copy_dest)\', 0700)' 560 'os.chmod(\'<(ui_copy_dest)\', 0700)'
550 ] 561 ]
551 } 562 }
552 ], 563 ],
553 }, 564 },
554 ], 565 ],
555 }], 566 }],
556 ], 567 ],
557 } 568 }
OLDNEW
« ui/base/touchui/OWNERS ('K') | « ui/base/x/events_x.cc ('k') | ui/ui_views.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698