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

Unified Diff: ash/ash.gyp

Issue 10054038: Support WebView in ash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ash/shell.h » ('j') | ash/shell/content_client/shell_browser_main_parts.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/ash.gyp
===================================================================
--- ash/ash.gyp (revision 131874)
+++ ash/ash.gyp (working copy)
@@ -420,6 +420,8 @@
'../base/base.gyp:base',
'../base/base.gyp:base_i18n',
'../chrome/chrome_resources.gyp:packed_resources',
+ '../content/content.gyp:content_shell_lib',
+ '../content/content.gyp:content',
'../skia/skia.gyp:skia',
'../third_party/icu/icu.gyp:icui18n',
'../third_party/icu/icu.gyp:icuuc',
@@ -435,8 +437,15 @@
'ash',
],
'sources': [
+ '../content/app/startup_helper_win.cc',
sky 2012/04/12 19:14:54 nit: put at end with other relative include (or pu
'shell/app_list.cc',
'shell/bubble.cc',
+ 'shell/content_client/shell_browser_main_parts.cc',
+ 'shell/content_client/shell_browser_main_parts.h',
+ 'shell/content_client/shell_content_browser_client.cc',
+ 'shell/content_client/shell_content_browser_client.h',
+ 'shell/content_client/shell_main_delegate.cc',
+ 'shell/content_client/shell_main_delegate.h',
'shell/example_factory.h',
'shell/launcher_delegate_impl.cc',
'shell/launcher_delegate_impl.h',
@@ -462,6 +471,16 @@
'../ui/views/test/test_views_delegate.cc',
],
'conditions': [
+ ['OS=="win"', {
+ 'msvs_settings': {
+ 'VCLinkerTool': {
+ 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS
+ },
+ },
+ 'dependencies': [
+ '../sandbox/sandbox.gyp:sandbox',
+ ],
+ }],
['OS=="mac"', {
'product_name': 'AuraShell',
'mac_bundle': 1,
« no previous file with comments | « no previous file | ash/shell.h » ('j') | ash/shell/content_client/shell_browser_main_parts.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698