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

Side by Side Diff: chrome_frame/chrome_frame.gyp

Issue 6321025: Further modifications to the Ready Mode UI in response to feedback. Height, i... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 10 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 | « chrome/app/cf_resources.rc ('k') | chrome_frame/ready_mode/internal/ready_prompt_window.h » ('j') | 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) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 'xul_sdk_dir': '../third_party/xulrunner-sdk/<(OS)', 8 'xul_sdk_dir': '../third_party/xulrunner-sdk/<(OS)',
9 9
10 'variables': { 10 'variables': {
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 'target_defaults': { 46 'target_defaults': {
47 'dependencies': [ 47 'dependencies': [
48 # locales need to be built for the chrome frame binaries to be loadable. 48 # locales need to be built for the chrome frame binaries to be loadable.
49 '../chrome/app/locales/locales.gyp:*', 49 '../chrome/app/locales/locales.gyp:*',
50 '../chrome/chrome.gyp:chrome_resources', 50 '../chrome/chrome.gyp:chrome_resources',
51 '../chrome/chrome.gyp:chrome_strings', 51 '../chrome/chrome.gyp:chrome_strings',
52 '../chrome/chrome.gyp:theme_resources', 52 '../chrome/chrome.gyp:theme_resources',
53 '../skia/skia.gyp:skia', 53 '../skia/skia.gyp:skia',
54 '../third_party/npapi/npapi.gyp:npapi', 54 '../third_party/npapi/npapi.gyp:npapi',
55 ], 55 ],
56 'defines': [ 'ISOLATION_AWARE_ENABLED=1' ],
56 'include_dirs': [ 57 'include_dirs': [
57 # all our own includes are relative to src/ 58 # all our own includes are relative to src/
58 '..', 59 '..',
59 ], 60 ],
60 }, 61 },
61 'targets': [ 62 'targets': [
62 { 63 {
63 # Builds the crash tests in crash_reporting. 64 # Builds the crash tests in crash_reporting.
64 'target_name': 'chrome_frame_crash_tests', 65 'target_name': 'chrome_frame_crash_tests',
65 'type': 'none', 66 'type': 'none',
(...skipping 982 matching lines...) Expand 10 before | Expand all | Expand 10 after
1048 }, 1049 },
1049 'msvs_settings': { 1050 'msvs_settings': {
1050 'VCLinkerTool': { 1051 'VCLinkerTool': {
1051 'OutputFile': 1052 'OutputFile':
1052 '$(OutDir)\\servers\\$(ProjectName).dll', 1053 '$(OutDir)\\servers\\$(ProjectName).dll',
1053 'DelayLoadDLLs': ['xpcom.dll', 'nspr4.dll'], 1054 'DelayLoadDLLs': ['xpcom.dll', 'nspr4.dll'],
1054 'BaseAddress': '0x33000000', 1055 'BaseAddress': '0x33000000',
1055 # Set /SUBSYSTEM:WINDOWS (for consistency). 1056 # Set /SUBSYSTEM:WINDOWS (for consistency).
1056 'SubSystem': '2', 1057 'SubSystem': '2',
1057 }, 1058 },
1059 'VCManifestTool': {
1060 'AdditionalManifestFiles':
1061 '$(ProjectDir)\\resources\\npchrome_frame.dll.manifest',
1062 },
1058 }, 1063 },
1059 }], 1064 }],
1060 ], 1065 ],
1061 }, 1066 },
1062 ], 1067 ],
1063 'conditions': [ 1068 'conditions': [
1064 # To enable the coverage targets, do 1069 # To enable the coverage targets, do
1065 # GYP_DEFINES='coverage=1' gclient sync 1070 # GYP_DEFINES='coverage=1' gclient sync
1066 ['coverage!=0', 1071 ['coverage!=0',
1067 { 'targets': [ 1072 { 'targets': [
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
1199 ], # 'conditions' 1204 ], # 'conditions'
1200 } 1205 }
1201 1206
1202 # vim: shiftwidth=2:et:ai:tabstop=2 1207 # vim: shiftwidth=2:et:ai:tabstop=2
1203 1208
1204 # Local Variables: 1209 # Local Variables:
1205 # tab-width:2 1210 # tab-width:2
1206 # indent-tabs-mode:nil 1211 # indent-tabs-mode:nil
1207 # End: 1212 # End:
1208 # vim: set expandtab tabstop=2 shiftwidth=2: 1213 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « chrome/app/cf_resources.rc ('k') | chrome_frame/ready_mode/internal/ready_prompt_window.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698