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

Unified Diff: ui/views/examples/examples.gyp

Issue 284113011: Repurpose views+content example into a generic multiprocess views runtime (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: app_list_demo.cc using example_main Created 6 years, 7 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 | « ui/views/examples/content_client/examples_main_exe.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/examples/examples.gyp
diff --git a/ui/views/examples/examples.gyp b/ui/views/examples/examples.gyp
index 100d8b94e44e87974f546cdf784a9c9640b4c6ec..da94ceec479da93b6e0dfe64ba35b5c550f6744a 100644
--- a/ui/views/examples/examples.gyp
+++ b/ui/views/examples/examples.gyp
@@ -119,7 +119,7 @@
'../../../base/base.gyp:base',
'../../../base/base.gyp:base_i18n',
'../../../content/content.gyp:content',
- '../../../skia/skia.gyp:skia',
+ '../../../content/content_shell_and_tests.gyp:content_shell_lib',
'../../../third_party/icu/icu.gyp:icui18n',
'../../../third_party/icu/icu.gyp:icuuc',
'../../../url/url.gyp:url_lib',
@@ -130,9 +130,6 @@
'../../gfx/gfx.gyp:gfx_geometry',
'../../resources/ui_resources.gyp:ui_resources',
'../../resources/ui_resources.gyp:ui_test_pak',
- '../controls/webview/webview.gyp:webview',
- '../views.gyp:views',
- 'views_examples_lib',
],
'include_dirs': [
'../../..',
@@ -141,11 +138,16 @@
'VIEWS_EXAMPLES_WITH_CONTENT_IMPLEMENTATION',
],
'sources': [
- 'examples_window_with_content.cc',
- 'examples_window_with_content.h',
+ '../../../content/app/startup_helper_win.cc',
+ 'content_client/examples_browser_main_parts.cc',
+ 'content_client/examples_browser_main_parts.h',
+ 'content_client/examples_content_browser_client.cc',
+ 'content_client/examples_content_browser_client.h',
+ 'content_client/examples_main_delegate.cc',
+ 'content_client/examples_main_delegate.h',
+ 'content_client/examples_main.cc',
+ 'content_client/examples_main.h',
'views_examples_with_content_export.h',
- 'webview_example.cc',
- 'webview_example.h',
],
'conditions': [
['OS=="win"', {
@@ -158,42 +160,38 @@
],
}, # target_name: views_examples_with_content_lib
{
- 'target_name': 'views_examples_with_content_exe',
- 'type': 'executable',
+ 'target_name': 'examples_window_with_content',
+ 'type': '<(component)',
+ 'sources': [
+ 'examples_window_with_content.cc',
+ 'examples_window_with_content.h',
+ 'webview_example.cc',
+ 'webview_example.h',
+ ],
'dependencies': [
'../../../base/base.gyp:base',
- '../../../base/base.gyp:base_i18n',
'../../../content/content.gyp:content',
- '../../../content/content_shell_and_tests.gyp:content_shell_lib',
- '../../../content/content_shell_and_tests.gyp:test_support_content',
'../../../skia/skia.gyp:skia',
- '../../../third_party/icu/icu.gyp:icui18n',
- '../../../third_party/icu/icu.gyp:icuuc',
- '../../aura/aura.gyp:aura',
- '../../base/ui_base.gyp:ui_base',
- '../../compositor/compositor.gyp:compositor',
- '../../events/events.gyp:events',
- '../../gfx/gfx.gyp:gfx',
- '../../gfx/gfx.gyp:gfx_geometry',
- '../../resources/ui_resources.gyp:ui_resources',
- '../../resources/ui_resources.gyp:ui_test_pak',
- '../../wm/wm.gyp:wm_test_support',
+ '../../../url/url.gyp:url_lib',
+ '../controls/webview/webview.gyp:webview',
'../views.gyp:views',
- '../views.gyp:views_test_support',
- 'views_examples_with_content_lib',
+ 'views_examples_lib',
],
- 'include_dirs': [
- '../../..',
+ 'defines': [
+ 'VIEWS_EXAMPLES_WITH_CONTENT_IMPLEMENTATION',
],
+ }, # target_name: examples_window_with_content
+ {
+ 'target_name': 'views_examples_with_content_exe',
+ 'type': 'executable',
'sources': [
- '../../../content/app/startup_helper_win.cc',
- 'content_client/examples_browser_main_parts.cc',
- 'content_client/examples_browser_main_parts.h',
- 'content_client/examples_content_browser_client.cc',
- 'content_client/examples_content_browser_client.h',
- 'content_client/examples_main_delegate.cc',
- 'content_client/examples_main_delegate.h',
- 'content_client/examples_main.cc',
+ 'content_client/examples_main_exe.cc',
+ ],
+ 'dependencies': [
+ '../../../base/base.gyp:base',
+ '../../../content/content.gyp:content',
+ 'views_examples_with_content_lib',
+ 'examples_window_with_content',
],
'conditions': [
['OS=="win"', {
@@ -213,16 +211,6 @@
'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS
},
},
- 'dependencies': [
- '../../../sandbox/sandbox.gyp:sandbox',
- ],
- }],
- ['OS=="win"', {
- 'sources/': [
- # This is needed because the aura rule strips it from the default
- # sources list.
- ['include', '^../../../content/app/startup_helper_win.cc'],
- ],
}],
],
}, # target_name: views_examples_with_content_exe
« no previous file with comments | « ui/views/examples/content_client/examples_main_exe.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698