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

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: Sky'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
« content/content.gyp ('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 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 'base/dialogs/base_shell_dialog.cc', 150 'base/dialogs/base_shell_dialog.cc',
149 'base/dialogs/base_shell_dialog.h', 151 'base/dialogs/base_shell_dialog.h',
150 'base/dialogs/base_shell_dialog_win.cc', 152 'base/dialogs/base_shell_dialog_win.cc',
151 'base/dialogs/base_shell_dialog_win.h', 153 'base/dialogs/base_shell_dialog_win.h',
152 'base/dialogs/gtk/select_file_dialog_impl.cc', 154 'base/dialogs/gtk/select_file_dialog_impl.cc',
153 'base/dialogs/gtk/select_file_dialog_impl.h', 155 'base/dialogs/gtk/select_file_dialog_impl.h',
154 'base/dialogs/gtk/select_file_dialog_impl_gtk.cc', 156 'base/dialogs/gtk/select_file_dialog_impl_gtk.cc',
155 'base/dialogs/gtk/select_file_dialog_impl_kde.cc', 157 'base/dialogs/gtk/select_file_dialog_impl_kde.cc',
156 'base/dialogs/select_file_dialog.cc', 158 'base/dialogs/select_file_dialog.cc',
157 'base/dialogs/select_file_dialog.h', 159 'base/dialogs/select_file_dialog.h',
160 'base/dialogs/select_file_dialog_android.cc',
161 'base/dialogs/select_file_dialog_android.h',
158 'base/dialogs/select_file_dialog_factory.cc', 162 'base/dialogs/select_file_dialog_factory.cc',
159 'base/dialogs/select_file_dialog_factory.h', 163 'base/dialogs/select_file_dialog_factory.h',
160 'base/dialogs/select_file_dialog_mac.h', 164 'base/dialogs/select_file_dialog_mac.h',
161 'base/dialogs/select_file_dialog_mac.mm', 165 'base/dialogs/select_file_dialog_mac.mm',
162 'base/dialogs/select_file_dialog_win.cc', 166 'base/dialogs/select_file_dialog_win.cc',
163 'base/dialogs/select_file_dialog_win.h', 167 'base/dialogs/select_file_dialog_win.h',
164 'base/dialogs/select_file_policy.cc', 168 'base/dialogs/select_file_policy.cc',
165 'base/dialogs/select_file_policy.h', 169 'base/dialogs/select_file_policy.h',
166 'base/dialogs/selected_file_info.cc', 170 'base/dialogs/selected_file_info.cc',
167 'base/dialogs/selected_file_info.h', 171 'base/dialogs/selected_file_info.h',
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after
373 'base/x/work_area_watcher_x.h', 377 'base/x/work_area_watcher_x.h',
374 'base/x/x11_atom_cache.cc', 378 'base/x/x11_atom_cache.cc',
375 'base/x/x11_atom_cache.h', 379 'base/x/x11_atom_cache.h',
376 'base/x/x11_util.cc', 380 'base/x/x11_util.cc',
377 'base/x/x11_util.h', 381 'base/x/x11_util.h',
378 'base/x/x11_util_internal.h', 382 'base/x/x11_util_internal.h',
379 'gfx/android/gfx_jni_registrar.cc', 383 'gfx/android/gfx_jni_registrar.cc',
380 'gfx/android/gfx_jni_registrar.h', 384 'gfx/android/gfx_jni_registrar.h',
381 'gfx/android/java_bitmap.cc', 385 'gfx/android/java_bitmap.cc',
382 'gfx/android/java_bitmap.h', 386 'gfx/android/java_bitmap.h',
387 'gfx/android/window_android.cc',
388 'gfx/android/window_android.h',
383 'gfx/blit.cc', 389 'gfx/blit.cc',
384 'gfx/blit.h', 390 'gfx/blit.h',
385 'gfx/canvas.cc', 391 'gfx/canvas.cc',
386 'gfx/canvas.h', 392 'gfx/canvas.h',
387 'gfx/canvas_android.cc', 393 'gfx/canvas_android.cc',
388 'gfx/canvas_mac.mm', 394 'gfx/canvas_mac.mm',
389 'gfx/canvas_paint.h', 395 'gfx/canvas_paint.h',
390 'gfx/canvas_paint_win.cc', 396 'gfx/canvas_paint_win.cc',
391 'gfx/canvas_skia.cc', 397 'gfx/canvas_skia.cc',
392 'gfx/canvas_skia_paint.h', 398 'gfx/canvas_skia_paint.h',
(...skipping 381 matching lines...) Expand 10 before | Expand all | Expand 10 after
774 'sources!': [ 780 'sources!': [
775 'base/dragdrop/drag_utils.cc', 781 'base/dragdrop/drag_utils.cc',
776 'base/dragdrop/drag_utils.h', 782 'base/dragdrop/drag_utils.h',
777 'base/touch/touch_factory.cc', 783 'base/touch/touch_factory.cc',
778 'base/touch/touch_factory.h', 784 'base/touch/touch_factory.h',
779 'gfx/pango_util.cc', 785 'gfx/pango_util.cc',
780 'gfx/pango_util.h', 786 'gfx/pango_util.h',
781 'gfx/platform_font_pango.cc', 787 'gfx/platform_font_pango.cc',
782 'gfx/platform_font_pango.h', 788 'gfx/platform_font_pango.h',
783 ], 789 ],
790 'dependencies': [
791 'ui_java',
792 'ui_jni_headers',
793 ],
794 'include_dirs': [
795 '<(SHARED_INTERMEDIATE_DIR)/ui',
796 ],
784 }], 797 }],
785 ['OS=="android" or OS=="ios"', { 798 ['OS=="android" or OS=="ios"', {
786 'sources!': [ 799 'sources!': [
787 'gfx/render_text.cc', 800 'gfx/render_text.cc',
788 'gfx/render_text.h', 801 'gfx/render_text.h',
789 ], 802 ],
790 }], 803 }],
791 ['OS=="linux"', { 804 ['OS=="linux"', {
792 'libraries': [ 805 'libraries': [
793 '-ldl', 806 '-ldl',
794 ], 807 ],
795 }], 808 }],
796 ['inside_chromium_build==0', { 809 ['inside_chromium_build==0', {
797 'dependencies': [ 810 'dependencies': [
798 '<(DEPTH)/webkit/support/setup_third_party.gyp:third_party_headers', 811 '<(DEPTH)/webkit/support/setup_third_party.gyp:third_party_headers',
799 ], 812 ],
800 }], 813 }],
801 ], 814 ],
802 }, 815 },
803 ], 816 ],
804 'conditions': [ 817 'conditions': [
805 ['inside_chromium_build == 1', { 818 ['inside_chromium_build == 1', {
806 'includes': [ 819 'includes': [
807 'ui_unittests.gypi', 820 'ui_unittests.gypi',
808 ]}, 821 ]},
809 ], 822 ],
823 ['OS=="android"' , {
824 'targets': [
825 {
826 'target_name': 'ui_jni_headers',
827 'type': 'none',
828 'sources': [
829 'android/java/src/org/chromium/ui/gfx/NativeWindow.java',
830 'android/java/src/org/chromium/ui/SelectFileDialog.java',
831 ],
832 'variables': {
833 'jni_gen_dir': 'ui',
834 },
835 'includes': [ '../build/jni_generator.gypi' ],
836 },
837 {
838 'target_name': 'ui_java',
839 'type': 'none',
840 'variables': {
841 'package_name': 'ui',
842 'java_in_dir': '../ui/android/java',
843 },
844 'dependencies': [
845 '../base/base.gyp:base_java',
846 ],
847 'export_dependent_settings': [
848 '../base/base.gyp:base_java',
849 ],
850 'includes': [ '../build/java.gypi' ],
851 },
852 ],
853 }],
810 ], 854 ],
811 } 855 }
OLDNEW
« content/content.gyp ('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