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

Side by Side Diff: ui/ui.gyp

Issue 9390038: Move automation/ui_controls to ui/ui_controls (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: win_aura fix, sync Created 8 years, 9 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/base/gtk/gtk_screen_utils.cc ('k') | ui/ui_controls/ui_controls.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 (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 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 'base/gtk/focus_store_gtk.h', 125 'base/gtk/focus_store_gtk.h',
126 'base/gtk/g_object_destructor_filo.cc', 126 'base/gtk/g_object_destructor_filo.cc',
127 'base/gtk/g_object_destructor_filo.h', 127 'base/gtk/g_object_destructor_filo.h',
128 'base/gtk/gtk_expanded_container.cc', 128 'base/gtk/gtk_expanded_container.cc',
129 'base/gtk/gtk_expanded_container.h', 129 'base/gtk/gtk_expanded_container.h',
130 'base/gtk/gtk_floating_container.cc', 130 'base/gtk/gtk_floating_container.cc',
131 'base/gtk/gtk_floating_container.h', 131 'base/gtk/gtk_floating_container.h',
132 'base/gtk/gtk_im_context_util.cc', 132 'base/gtk/gtk_im_context_util.cc',
133 'base/gtk/gtk_im_context_util.h', 133 'base/gtk/gtk_im_context_util.h',
134 'base/gtk/gtk_hig_constants.h', 134 'base/gtk/gtk_hig_constants.h',
135 'base/gtk/gtk_screen_utils.cc', 135 'base/gtk/gtk_screen_util.cc',
136 'base/gtk/gtk_screen_utils.h', 136 'base/gtk/gtk_screen_util.h',
137 'base/gtk/gtk_signal.h', 137 'base/gtk/gtk_signal.h',
138 'base/gtk/gtk_signal_registrar.cc', 138 'base/gtk/gtk_signal_registrar.cc',
139 'base/gtk/gtk_signal_registrar.h', 139 'base/gtk/gtk_signal_registrar.h',
140 'base/gtk/gtk_windowing.cc', 140 'base/gtk/gtk_windowing.cc',
141 'base/gtk/gtk_windowing.h', 141 'base/gtk/gtk_windowing.h',
142 'base/gtk/owned_widget_gtk.cc', 142 'base/gtk/owned_widget_gtk.cc',
143 'base/gtk/owned_widget_gtk.h', 143 'base/gtk/owned_widget_gtk.h',
144 'base/gtk/scoped_gobject.h', 144 'base/gtk/scoped_gobject.h',
145 'base/gtk/scoped_region.cc', 145 'base/gtk/scoped_region.cc',
146 'base/gtk/scoped_region.h', 146 'base/gtk/scoped_region.h',
(...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after
357 'gfx/skbitmap_operations.cc', 357 'gfx/skbitmap_operations.cc',
358 'gfx/skbitmap_operations.h', 358 'gfx/skbitmap_operations.h',
359 'gfx/skia_util.cc', 359 'gfx/skia_util.cc',
360 'gfx/skia_util.h', 360 'gfx/skia_util.h',
361 'gfx/skia_utils_gtk.cc', 361 'gfx/skia_utils_gtk.cc',
362 'gfx/skia_utils_gtk.h', 362 'gfx/skia_utils_gtk.h',
363 'gfx/transform.cc', 363 'gfx/transform.cc',
364 'gfx/transform.h', 364 'gfx/transform.h',
365 'gfx/transform_util.cc', 365 'gfx/transform_util.cc',
366 'gfx/transform_util.h', 366 'gfx/transform_util.h',
367 'ui_controls/ui_controls.h',
368 'ui_controls/ui_controls_aura.cc',
369 'ui_controls/ui_controls_export.h',
370 'ui_controls/ui_controls_internal_win.h',
371 'ui_controls/ui_controls_internal_win.cc',
372 'ui_controls/ui_controls_gtk.cc',
373 'ui_controls/ui_controls_mac.mm',
374 'ui_controls/ui_controls_win.cc',
367 ], 375 ],
368 'conditions': [ 376 'conditions': [
369 # TODO(asvitkine): Switch all platforms to use_canvas_skia_skia.cc. 377 # TODO(asvitkine): Switch all platforms to use_canvas_skia_skia.cc.
370 # http://crbug.com/105550 378 # http://crbug.com/105550
371 ['use_canvas_skia_skia==1', { 379 ['use_canvas_skia_skia==1', {
372 'sources!': [ 380 'sources!': [
373 'gfx/canvas_skia_android.cc', 381 'gfx/canvas_skia_android.cc',
374 'gfx/canvas_skia_linux.cc', 382 'gfx/canvas_skia_linux.cc',
375 'gfx/canvas_skia_mac.mm', 383 'gfx/canvas_skia_mac.mm',
376 'gfx/canvas_skia_win.cc', 384 'gfx/canvas_skia_win.cc',
(...skipping 18 matching lines...) Expand all
395 ['exclude', 'base/win/mouse_wheel_util.cc'], 403 ['exclude', 'base/win/mouse_wheel_util.cc'],
396 ['exclude', 'base/win/mouse_wheel_util.h'], 404 ['exclude', 'base/win/mouse_wheel_util.h'],
397 ['exclude', 'base/x/active_window_watcher_x.cc'], 405 ['exclude', 'base/x/active_window_watcher_x.cc'],
398 ['exclude', 'base/x/active_window_watcher_x.h'], 406 ['exclude', 'base/x/active_window_watcher_x.h'],
399 ['exclude', 'base/x/active_window_watcher_x_observer.h'], 407 ['exclude', 'base/x/active_window_watcher_x_observer.h'],
400 ['exclude', 'base/x/root_window_property_watcher_x.cc'], 408 ['exclude', 'base/x/root_window_property_watcher_x.cc'],
401 ['exclude', 'base/x/root_window_property_watcher_x.h'], 409 ['exclude', 'base/x/root_window_property_watcher_x.h'],
402 ['exclude', 'base/x/work_area_watcher_x.cc'], 410 ['exclude', 'base/x/work_area_watcher_x.cc'],
403 ['exclude', 'base/x/work_area_watcher_x.h'], 411 ['exclude', 'base/x/work_area_watcher_x.h'],
404 ['exclude', 'base/x/work_area_watcher_x_observer.h'], 412 ['exclude', 'base/x/work_area_watcher_x_observer.h'],
413 ['exclude', 'ui_controls_win.cc'],
405 ], 414 ],
406 }, { # use_aura!=1 415 }, { # use_aura!=1
407 'sources!': [ 416 'sources!': [
408 'gfx/native_theme_aura.cc', 417 'gfx/native_theme_aura.cc',
409 'gfx/native_theme_aura.h', 418 'gfx/native_theme_aura.h',
410 ] 419 ]
411 }], 420 }],
412 ['use_aura==1 and OS=="win"', { 421 ['use_aura==1 and OS=="win"', {
413 'sources/': [ 422 'sources/': [
414 ['exclude', 'base/dragdrop/os_exchange_data_provider_win.cc'], 423 ['exclude', 'base/dragdrop/os_exchange_data_provider_win.cc'],
(...skipping 287 matching lines...) Expand 10 before | Expand all | Expand 10 after
702 'shutil.copyfile(\'<(ui_copy_target)\', \'<(ui_copy_dest)\'); ' \ 711 'shutil.copyfile(\'<(ui_copy_target)\', \'<(ui_copy_dest)\'); ' \
703 'os.chmod(\'<(ui_copy_dest)\', 0700)' 712 'os.chmod(\'<(ui_copy_dest)\', 0700)'
704 ] 713 ]
705 } 714 }
706 ], 715 ],
707 }, 716 },
708 ], 717 ],
709 }], 718 }],
710 ], 719 ],
711 } 720 }
OLDNEW
« no previous file with comments | « ui/base/gtk/gtk_screen_utils.cc ('k') | ui/ui_controls/ui_controls.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698