diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-20 23:31:34 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-20 23:31:34 +0000 |
| commit | 9fbd3f863f3cde073ff6c6ae15ac2c7dc2a9a0bd (patch) | |
| tree | 05bb5ced1dbefe68107d7c7995b886630d2b50fa /content/content_shell.gypi | |
| parent | 9044359baca309ab260075f8b6a87762c675ada1 (diff) | |
| download | chromium_src-9fbd3f863f3cde073ff6c6ae15ac2c7dc2a9a0bd.zip chromium_src-9fbd3f863f3cde073ff6c6ae15ac2c7dc2a9a0bd.tar.gz chromium_src-9fbd3f863f3cde073ff6c6ae15ac2c7dc2a9a0bd.tar.bz2 | |
Add a simple GUI around the content shell. This is inspired heavily by TestShell.
BUG=90445
Review URL: http://codereview.chromium.org/7983015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102053 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/content_shell.gypi')
| -rw-r--r-- | content/content_shell.gypi | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/content/content_shell.gypi b/content/content_shell.gypi index 1876ec2..8d913ac 100644 --- a/content/content_shell.gypi +++ b/content/content_shell.gypi @@ -7,6 +7,9 @@ { 'target_name': 'content_shell', 'type': 'executable', + 'variables': { + 'chromium_code': 1, + }, 'dependencies': [ 'content_app', 'content_browser', @@ -27,6 +30,11 @@ 'browser/download/mock_download_manager_delegate.cc', 'browser/tab_contents/tab_contents_view_win.cc', 'browser/tab_contents/tab_contents_view_win.h', + 'shell/shell.cc', + 'shell/shell.h', + 'shell/shell_gtk.cc', + 'shell/shell_mac.mm', + 'shell/shell_win.cc', 'shell/shell_browser_context.cc', 'shell/shell_browser_context.h', 'shell/shell_browser_main.cc', @@ -54,6 +62,38 @@ '../base/allocator/allocator.gyp:allocator', ], }], + ['OS=="win"', { + 'resource_include_dirs': [ + '<(SHARED_INTERMEDIATE_DIR)/webkit', + ], + 'sources': [ + 'shell/resource.h', + 'shell/shell.rc', + # TODO: It would be nice to have these pulled in + # automatically from direct_dependent_settings in + # their various targets (net.gyp:net_resources, etc.), + # but that causes errors in other targets when + # resulting .res files get referenced multiple times. + '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', + '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc', + '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', + '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.rc', + ], + 'dependencies': [ + '<(DEPTH)/net/net.gyp:net_resources', + '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_resources', + '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_strings', + ], + 'configurations': { + 'Debug_Base': { + 'msvs_settings': { + 'VCLinkerTool': { + 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', + }, + }, + }, + }, + }], ], }, ], |