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

Side by Side Diff: ui/ui.gyp

Issue 22314005: [Android] On calling openNewTab, pass the disposition instead of incognito. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: reverted copyright year update Created 7 years, 4 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
« no previous file with comments | « ui/base/window_open_disposition_list.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 'shell_dialogs.gypi', 10 'shell_dialogs.gypi',
(...skipping 948 matching lines...) Expand 10 before | Expand all | Expand 10 after
959 'type': 'none', 959 'type': 'none',
960 'variables': { 960 'variables': {
961 'java_in_dir': '../ui/android/java', 961 'java_in_dir': '../ui/android/java',
962 'has_java_resources': 1, 962 'has_java_resources': 1,
963 'R_package': 'org.chromium.ui', 963 'R_package': 'org.chromium.ui',
964 'R_package_relpath': 'org/chromium/ui', 964 'R_package_relpath': 'org/chromium/ui',
965 'java_strings_grd': 'android_ui_strings.grd', 965 'java_strings_grd': 'android_ui_strings.grd',
966 }, 966 },
967 'dependencies': [ 967 'dependencies': [
968 '../base/base.gyp:base_java', 968 '../base/base.gyp:base_java',
969 'window_open_disposition_java',
969 ], 970 ],
970 'includes': [ '../build/java.gypi' ], 971 'includes': [ '../build/java.gypi' ],
971 }, 972 },
973 {
974 'target_name': 'window_open_disposition_java',
975 'type': 'none',
976 'sources': [
977 'android/java/WindowOpenDisposition.template',
978 ],
979 'variables': {
980 'package_name': 'org/chromium/ui',
981 'template_deps': ['base/window_open_disposition_list.h'],
982 },
983 'includes': [ '../build/android/java_cpp_template.gypi' ],
984 },
972 ], 985 ],
973 }], 986 }],
974 ['OS=="mac"', { 987 ['OS=="mac"', {
975 'targets': [ 988 'targets': [
976 { 989 {
977 'target_name': 'ui_cocoa_third_party_toolkits', 990 'target_name': 'ui_cocoa_third_party_toolkits',
978 'type': '<(component)', 991 'type': '<(component)',
979 'sources': [ 992 'sources': [
980 # Build Apple sample code 993 # Build Apple sample code
981 '../third_party/apple_sample_code/ImageAndTextCell.h', 994 '../third_party/apple_sample_code/ImageAndTextCell.h',
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
1036 'xcode_settings': { 1049 'xcode_settings': {
1037 'GCC_SYMBOLS_PRIVATE_EXTERN': 'NO', 1050 'GCC_SYMBOLS_PRIVATE_EXTERN': 'NO',
1038 }, 1051 },
1039 }], 1052 }],
1040 ], 1053 ],
1041 }, 1054 },
1042 ], 1055 ],
1043 }], 1056 }],
1044 ], 1057 ],
1045 } 1058 }
OLDNEW
« no previous file with comments | « ui/base/window_open_disposition_list.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698