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

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: use sandbox boilerplate for now 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
Index: ui/views/examples/examples.gyp
diff --git a/ui/views/examples/examples.gyp b/ui/views/examples/examples.gyp
index 100d8b94e44e87974f546cdf784a9c9640b4c6ec..fe1b40cd5f631e01c097ce43f64e01da6ed69cd6 100644
--- a/ui/views/examples/examples.gyp
+++ b/ui/views/examples/examples.gyp
@@ -119,10 +119,11 @@
'../../../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',
+ '../../accessibility/accessibility.gyp:ax_gen',
'../../aura/aura.gyp:aura',
'../../base/ui_base.gyp:ui_base',
'../../events/events.gyp:events',
@@ -130,9 +131,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,59 +139,52 @@
'VIEWS_EXAMPLES_WITH_CONTENT_IMPLEMENTATION',
],
'sources': [
+ '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',
+ ],
+ }, # target_name: views_examples_with_content_lib
+ {
+ 'target_name': 'examples_window_with_content',
+ 'type': '<(component)',
+ 'dependencies': [
+ '../../../base/base.gyp:base',
+ '../../../content/content.gyp:content',
+ '../../../skia/skia.gyp:skia',
+ '../../../url/url.gyp:url_lib',
+ '../../events/events.gyp:events',
+ '../controls/webview/webview.gyp:webview',
+ '../views.gyp:views',
+ 'views_examples_lib',
+ ],
+ 'defines': [
+ 'VIEWS_EXAMPLES_WITH_CONTENT_IMPLEMENTATION',
+ ],
+ 'sources': [
'examples_window_with_content.cc',
'examples_window_with_content.h',
- 'views_examples_with_content_export.h',
'webview_example.cc',
'webview_example.h',
],
- 'conditions': [
- ['OS=="win"', {
- 'include_dirs': [
- '../../../third_party/wtl/include',
- ],
- # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
- 'msvs_disabled_warnings': [ 4267, ],
- }],
- ],
- }, # target_name: views_examples_with_content_lib
+ }, # target_name: examples_window_with_content
{
'target_name': 'views_examples_with_content_exe',
'type': 'executable',
'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',
- '../views.gyp:views',
- '../views.gyp:views_test_support',
'views_examples_with_content_lib',
- ],
- 'include_dirs': [
- '../../..',
+ 'examples_window_with_content',
],
'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',
],
'conditions': [
['OS=="win"', {
@@ -217,13 +208,6 @@
'../../../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
],

Powered by Google App Engine
This is Rietveld 408576698