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

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: Split DeviceTelephonyInfo from DeviceDisplayInfo; added SCALE_FACTOR_150P and 300P. 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
« ui/base/layout.cc ('K') | « 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 'ui_resources.gypi', 10 'ui_resources.gypi',
(...skipping 326 matching lines...) Expand 10 before | Expand all | Expand 10 after
337 'base/x/root_window_property_watcher_x.h', 337 'base/x/root_window_property_watcher_x.h',
338 'base/x/valuators.cc', 338 'base/x/valuators.cc',
339 'base/x/valuators.h', 339 'base/x/valuators.h',
340 'base/x/work_area_watcher_x.cc', 340 'base/x/work_area_watcher_x.cc',
341 'base/x/work_area_watcher_x.h', 341 'base/x/work_area_watcher_x.h',
342 'base/x/x11_atom_cache.cc', 342 'base/x/x11_atom_cache.cc',
343 'base/x/x11_atom_cache.h', 343 'base/x/x11_atom_cache.h',
344 'base/x/x11_util.cc', 344 'base/x/x11_util.cc',
345 'base/x/x11_util.h', 345 'base/x/x11_util.h',
346 'base/x/x11_util_internal.h', 346 'base/x/x11_util_internal.h',
347 'gfx/android/gfx_jni_registrar.cc', 347 'gfx/android/device_display_info.cc',
348 'gfx/android/gfx_jni_registrar.h', 348 'gfx/android/device_display_info.h',
349 'gfx/android/java_bitmap.cc', 349 'gfx/android/java_bitmap.cc',
350 'gfx/android/java_bitmap.h', 350 'gfx/android/java_bitmap.h',
351 'gfx/android/window_android.cc', 351 'gfx/android/window_android.cc',
352 'gfx/android/window_android.h', 352 'gfx/android/window_android.h',
353 'gfx/blit.cc', 353 'gfx/blit.cc',
354 'gfx/blit.h', 354 'gfx/blit.h',
355 'gfx/canvas.cc', 355 'gfx/canvas.cc',
356 'gfx/canvas.h', 356 'gfx/canvas.h',
357 'gfx/canvas_android.cc', 357 'gfx/canvas_android.cc',
358 'gfx/canvas_mac.mm', 358 'gfx/canvas_mac.mm',
(...skipping 506 matching lines...) Expand 10 before | Expand all | Expand 10 after
865 'ui_unittests.gypi', 865 'ui_unittests.gypi',
866 ]}, 866 ]},
867 ], 867 ],
868 ['OS=="android"' , { 868 ['OS=="android"' , {
869 'targets': [ 869 'targets': [
870 { 870 {
871 'target_name': 'ui_jni_headers', 871 'target_name': 'ui_jni_headers',
872 'type': 'none', 872 'type': 'none',
873 'sources': [ 873 'sources': [
874 'android/java/src/org/chromium/ui/gfx/BitmapHelper.java', 874 'android/java/src/org/chromium/ui/gfx/BitmapHelper.java',
875 'android/java/src/org/chromium/ui/gfx/DeviceDisplayInfo.java',
875 'android/java/src/org/chromium/ui/gfx/NativeWindow.java', 876 'android/java/src/org/chromium/ui/gfx/NativeWindow.java',
876 'android/java/src/org/chromium/ui/SelectFileDialog.java', 877 'android/java/src/org/chromium/ui/SelectFileDialog.java',
877 ], 878 ],
878 'variables': { 879 'variables': {
879 'jni_gen_dir': 'ui', 880 'jni_gen_dir': 'ui',
880 }, 881 },
881 'includes': [ '../build/jni_generator.gypi' ], 882 'includes': [ '../build/jni_generator.gypi' ],
882 }, 883 },
883 { 884 {
884 'target_name': 'ui_java', 885 'target_name': 'ui_java',
885 'type': 'none', 886 'type': 'none',
886 'variables': { 887 'variables': {
887 'package_name': 'ui', 888 'package_name': 'ui',
888 'java_in_dir': '../ui/android/java', 889 'java_in_dir': '../ui/android/java',
889 'has_java_resources': 1, 890 'has_java_resources': 1,
890 'R_package': 'org.chromium.ui', 891 'R_package': 'org.chromium.ui',
891 'R_package_relpath': 'org/chromium/ui', 892 'R_package_relpath': 'org/chromium/ui',
892 'java_strings_grd': 'android_ui_strings.grd', 893 'java_strings_grd': 'android_ui_strings.grd',
893 }, 894 },
894 'dependencies': [ 895 'dependencies': [
895 '../base/base.gyp:base_java', 896 '../base/base.gyp:base_java',
896 ], 897 ],
897 'includes': [ '../build/java.gypi' ], 898 'includes': [ '../build/java.gypi' ],
898 }, 899 },
899 ], 900 ],
900 }], 901 }],
901 ], 902 ],
902 } 903 }
OLDNEW
« ui/base/layout.cc ('K') | « ui/test/test_suite.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698