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

Side by Side Diff: ui/ui.gyp

Issue 11886074: Use correct favicon scale factor on Android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Final rebase after DIP scale fix. Created 7 years, 11 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/test/test_suite.cc ('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 'shell_dialogs.gypi', 10 'shell_dialogs.gypi',
(...skipping 306 matching lines...) Expand 10 before | Expand all | Expand 10 after
317 'base/x/root_window_property_watcher_x.h', 317 'base/x/root_window_property_watcher_x.h',
318 'base/x/valuators.cc', 318 'base/x/valuators.cc',
319 'base/x/valuators.h', 319 'base/x/valuators.h',
320 'base/x/work_area_watcher_x.cc', 320 'base/x/work_area_watcher_x.cc',
321 'base/x/work_area_watcher_x.h', 321 'base/x/work_area_watcher_x.h',
322 'base/x/x11_atom_cache.cc', 322 'base/x/x11_atom_cache.cc',
323 'base/x/x11_atom_cache.h', 323 'base/x/x11_atom_cache.h',
324 'base/x/x11_util.cc', 324 'base/x/x11_util.cc',
325 'base/x/x11_util.h', 325 'base/x/x11_util.h',
326 'base/x/x11_util_internal.h', 326 'base/x/x11_util_internal.h',
327 'gfx/android/gfx_jni_registrar.cc', 327 'gfx/android/device_display_info.cc',
328 'gfx/android/gfx_jni_registrar.h', 328 'gfx/android/device_display_info.h',
329 'gfx/android/java_bitmap.cc', 329 'gfx/android/java_bitmap.cc',
330 'gfx/android/java_bitmap.h', 330 'gfx/android/java_bitmap.h',
331 'gfx/android/window_android.cc', 331 'gfx/android/window_android.cc',
332 'gfx/android/window_android.h', 332 'gfx/android/window_android.h',
333 'gfx/blit.cc', 333 'gfx/blit.cc',
334 'gfx/blit.h', 334 'gfx/blit.h',
335 'gfx/canvas.cc', 335 'gfx/canvas.cc',
336 'gfx/canvas.h', 336 'gfx/canvas.h',
337 'gfx/canvas_android.cc', 337 'gfx/canvas_android.cc',
338 'gfx/canvas_mac.mm', 338 'gfx/canvas_mac.mm',
(...skipping 505 matching lines...) Expand 10 before | Expand all | Expand 10 after
844 'ui_unittests.gypi', 844 'ui_unittests.gypi',
845 ]}, 845 ]},
846 ], 846 ],
847 ['OS=="android"' , { 847 ['OS=="android"' , {
848 'targets': [ 848 'targets': [
849 { 849 {
850 'target_name': 'ui_jni_headers', 850 'target_name': 'ui_jni_headers',
851 'type': 'none', 851 'type': 'none',
852 'sources': [ 852 'sources': [
853 'android/java/src/org/chromium/ui/gfx/BitmapHelper.java', 853 'android/java/src/org/chromium/ui/gfx/BitmapHelper.java',
854 'android/java/src/org/chromium/ui/gfx/DeviceDisplayInfo.java',
854 'android/java/src/org/chromium/ui/gfx/NativeWindow.java', 855 'android/java/src/org/chromium/ui/gfx/NativeWindow.java',
855 'android/java/src/org/chromium/ui/SelectFileDialog.java', 856 'android/java/src/org/chromium/ui/SelectFileDialog.java',
856 ], 857 ],
857 'variables': { 858 'variables': {
858 'jni_gen_dir': 'ui', 859 'jni_gen_dir': 'ui',
859 }, 860 },
860 'includes': [ '../build/jni_generator.gypi' ], 861 'includes': [ '../build/jni_generator.gypi' ],
861 }, 862 },
862 { 863 {
863 'target_name': 'ui_java', 864 'target_name': 'ui_java',
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
928 'link_settings': { 929 'link_settings': {
929 'libraries': [ 930 'libraries': [
930 '$(SDKROOT)/System/Library/Frameworks/Cocoa.framework', 931 '$(SDKROOT)/System/Library/Frameworks/Cocoa.framework',
931 ], 932 ],
932 }, 933 },
933 }, 934 },
934 ], 935 ],
935 }], 936 }],
936 ], 937 ],
937 } 938 }
OLDNEW
« no previous file with comments | « ui/test/test_suite.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698