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

Side by Side Diff: ui/ui.gyp

Issue 10916160: Upstreaming SelectFileDialog for Android (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Elliot's nits Created 8 years, 3 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
« ui/gfx/native_widget_types.h ('K') | « ui/gfx/native_widget_types.h ('k') | no next file » | 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 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 'gfx/screen_ios.mm', 68 'gfx/screen_ios.mm',
69 'gfx/screen_mac.mm', 69 'gfx/screen_mac.mm',
70 'gfx/screen_win.cc', 70 'gfx/screen_win.cc',
71 'gfx/size.cc', 71 'gfx/size.cc',
72 'gfx/size.h', 72 'gfx/size.h',
73 'gfx/size_base.h', 73 'gfx/size_base.h',
74 'gfx/size_base_impl.h', 74 'gfx/size_base_impl.h',
75 ], 75 ],
76 'all_sources': [ 76 'all_sources': [
77 '<@(_common_sources)', 77 '<@(_common_sources)',
78 'android/ui_jni_registrar.cc',
79 'android/ui_jni_registrar.h',
78 'base/accelerators/accelerator.cc', 80 'base/accelerators/accelerator.cc',
79 'base/accelerators/accelerator.h', 81 'base/accelerators/accelerator.h',
80 'base/accelerators/accelerator_cocoa.h', 82 'base/accelerators/accelerator_cocoa.h',
81 'base/accelerators/accelerator_cocoa.mm', 83 'base/accelerators/accelerator_cocoa.mm',
82 'base/accelerators/accelerator_gtk.cc', 84 'base/accelerators/accelerator_gtk.cc',
83 'base/accelerators/accelerator_gtk.h', 85 'base/accelerators/accelerator_gtk.h',
84 'base/accelerators/accelerator_manager.cc', 86 'base/accelerators/accelerator_manager.cc',
85 'base/accelerators/accelerator_manager.h', 87 'base/accelerators/accelerator_manager.h',
86 'base/accessibility/accessibility_types.h', 88 'base/accessibility/accessibility_types.h',
87 'base/accessibility/accessible_text_utils.cc', 89 'base/accessibility/accessible_text_utils.cc',
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 'base/cocoa/nib_loading.h', 134 'base/cocoa/nib_loading.h',
133 'base/cocoa/nib_loading.mm', 135 'base/cocoa/nib_loading.mm',
134 'base/cocoa/underlay_opengl_hosting_window.h', 136 'base/cocoa/underlay_opengl_hosting_window.h',
135 'base/cocoa/underlay_opengl_hosting_window.mm', 137 'base/cocoa/underlay_opengl_hosting_window.mm',
136 'base/cocoa/window_size_constants.h', 138 'base/cocoa/window_size_constants.h',
137 'base/cocoa/window_size_constants.mm', 139 'base/cocoa/window_size_constants.mm',
138 'base/cursor/cursor.cc', 140 'base/cursor/cursor.cc',
139 'base/cursor/cursor.h', 141 'base/cursor/cursor.h',
140 'base/cursor/cursor_win.cc', 142 'base/cursor/cursor_win.cc',
141 'base/cursor/cursor_x11.cc', 143 'base/cursor/cursor_x11.cc',
144 'base/dialogs/android/select_file_dialog_android.cc',
Yaron 2012/09/12 19:14:45 You don't really need the /android/ dir. This can
145 'base/dialogs/android/select_file_dialog_android.h',
142 'base/dialogs/base_shell_dialog.cc', 146 'base/dialogs/base_shell_dialog.cc',
143 'base/dialogs/base_shell_dialog.h', 147 'base/dialogs/base_shell_dialog.h',
144 'base/dialogs/base_shell_dialog_win.cc', 148 'base/dialogs/base_shell_dialog_win.cc',
145 'base/dialogs/base_shell_dialog_win.h', 149 'base/dialogs/base_shell_dialog_win.h',
146 'base/dialogs/gtk/select_file_dialog_impl.cc', 150 'base/dialogs/gtk/select_file_dialog_impl.cc',
147 'base/dialogs/gtk/select_file_dialog_impl.h', 151 'base/dialogs/gtk/select_file_dialog_impl.h',
148 'base/dialogs/gtk/select_file_dialog_impl_gtk.cc', 152 'base/dialogs/gtk/select_file_dialog_impl_gtk.cc',
149 'base/dialogs/gtk/select_file_dialog_impl_kde.cc', 153 'base/dialogs/gtk/select_file_dialog_impl_kde.cc',
150 'base/dialogs/select_file_dialog.cc', 154 'base/dialogs/select_file_dialog.cc',
151 'base/dialogs/select_file_dialog.h', 155 'base/dialogs/select_file_dialog.h',
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after
363 'base/x/valuators.h', 367 'base/x/valuators.h',
364 'base/x/work_area_watcher_x.cc', 368 'base/x/work_area_watcher_x.cc',
365 'base/x/work_area_watcher_x.h', 369 'base/x/work_area_watcher_x.h',
366 'base/x/x11_util.cc', 370 'base/x/x11_util.cc',
367 'base/x/x11_util.h', 371 'base/x/x11_util.h',
368 'base/x/x11_util_internal.h', 372 'base/x/x11_util_internal.h',
369 'gfx/android/gfx_jni_registrar.cc', 373 'gfx/android/gfx_jni_registrar.cc',
370 'gfx/android/gfx_jni_registrar.h', 374 'gfx/android/gfx_jni_registrar.h',
371 'gfx/android/java_bitmap.cc', 375 'gfx/android/java_bitmap.cc',
372 'gfx/android/java_bitmap.h', 376 'gfx/android/java_bitmap.h',
377 'gfx/android/window_android.cc',
378 'gfx/android/window_android.h',
373 'gfx/blit.cc', 379 'gfx/blit.cc',
374 'gfx/blit.h', 380 'gfx/blit.h',
375 'gfx/canvas.cc', 381 'gfx/canvas.cc',
376 'gfx/canvas.h', 382 'gfx/canvas.h',
377 'gfx/canvas_android.cc', 383 'gfx/canvas_android.cc',
378 'gfx/canvas_mac.mm', 384 'gfx/canvas_mac.mm',
379 'gfx/canvas_paint.h', 385 'gfx/canvas_paint.h',
380 'gfx/canvas_paint_win.cc', 386 'gfx/canvas_paint_win.cc',
381 'gfx/canvas_skia.cc', 387 'gfx/canvas_skia.cc',
382 'gfx/canvas_skia_paint.h', 388 'gfx/canvas_skia_paint.h',
(...skipping 372 matching lines...) Expand 10 before | Expand all | Expand 10 after
755 'sources!': [ 761 'sources!': [
756 'base/dragdrop/drag_utils.cc', 762 'base/dragdrop/drag_utils.cc',
757 'base/dragdrop/drag_utils.h', 763 'base/dragdrop/drag_utils.h',
758 'base/touch/touch_factory.cc', 764 'base/touch/touch_factory.cc',
759 'base/touch/touch_factory.h', 765 'base/touch/touch_factory.h',
760 'gfx/pango_util.cc', 766 'gfx/pango_util.cc',
761 'gfx/pango_util.h', 767 'gfx/pango_util.h',
762 'gfx/platform_font_pango.cc', 768 'gfx/platform_font_pango.cc',
763 'gfx/platform_font_pango.h', 769 'gfx/platform_font_pango.h',
764 ], 770 ],
771 'dependencies': [
772 'ui_java',
773 'ui_jni_headers',
774 ],
775 'include_dirs': [
776 '<(SHARED_INTERMEDIATE_DIR)/ui',
777 ],
765 }], 778 }],
766 ['OS=="android" or OS=="ios"', { 779 ['OS=="android" or OS=="ios"', {
767 'sources!': [ 780 'sources!': [
768 'gfx/render_text.cc', 781 'gfx/render_text.cc',
769 'gfx/render_text.h', 782 'gfx/render_text.h',
770 ], 783 ],
771 }], 784 }],
772 ['OS=="linux"', { 785 ['OS=="linux"', {
773 'libraries': [ 786 'libraries': [
774 '-ldl', 787 '-ldl',
775 ], 788 ],
776 }], 789 }],
777 ['inside_chromium_build==0', { 790 ['inside_chromium_build==0', {
778 'dependencies': [ 791 'dependencies': [
779 '<(DEPTH)/webkit/support/setup_third_party.gyp:third_party_headers', 792 '<(DEPTH)/webkit/support/setup_third_party.gyp:third_party_headers',
780 ], 793 ],
781 }], 794 }],
782 ], 795 ],
783 }, 796 },
784 ], 797 ],
785 'conditions': [ 798 'conditions': [
786 ['inside_chromium_build == 1', { 799 ['inside_chromium_build == 1', {
787 'includes': [ 800 'includes': [
788 'ui_unittests.gypi', 801 'ui_unittests.gypi',
789 ]}, 802 ]},
790 ], 803 ],
804 ['OS=="android"' , {
805 'targets': [
806 {
807 'target_name': 'ui_jni_headers',
808 'type': 'none',
809 'sources': [
810 'android/java/src/org/chromium/ui/gfx/NativeWindow.java',
811 'android/java/src/org/chromium/ui/SelectFileDialog.java',
812 ],
813 'variables': {
814 'jni_gen_dir': 'ui',
815 },
816 'includes': [ '../build/jni_generator.gypi' ],
817 },
818 {
819 'target_name': 'ui_java',
820 'type': 'none',
821 'variables': {
822 'package_name': 'ui',
823 'java_in_dir': '../ui/android/java',
824 },
825 'dependencies': [
826 '../base/base.gyp:base_java',
827 ],
828 'export_dependent_settings': [
829 '../base/base.gyp:base_java',
830 ],
831 'includes': [ '../build/java.gypi' ],
832 },
833 ],
834 }],
791 ], 835 ],
792 } 836 }
OLDNEW
« ui/gfx/native_widget_types.h ('K') | « ui/gfx/native_widget_types.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698