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

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

Issue 288313012: Revert of Repurpose views+content example into a generic multiprocess views runtime (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 aa41cd0fc2cf64a54b3e6f57f54a8b47173a6a97..100d8b94e44e87974f546cdf784a9c9640b4c6ec 100644
--- a/ui/views/examples/examples.gyp
+++ b/ui/views/examples/examples.gyp
@@ -117,13 +117,25 @@
'type': '<(component)',
'dependencies': [
'../../../base/base.gyp:base',
+ '../../../base/base.gyp:base_i18n',
'../../../content/content.gyp:content',
'../../../skia/skia.gyp:skia',
+ '../../../third_party/icu/icu.gyp:icui18n',
+ '../../../third_party/icu/icu.gyp:icuuc',
'../../../url/url.gyp:url_lib',
+ '../../aura/aura.gyp:aura',
+ '../../base/ui_base.gyp:ui_base',
'../../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',
'../controls/webview/webview.gyp:webview',
'../views.gyp:views',
'views_examples_lib',
+ ],
+ 'include_dirs': [
+ '../../..',
],
'defines': [
'VIEWS_EXAMPLES_WITH_CONTENT_IMPLEMENTATION',
@@ -135,19 +147,53 @@
'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': 'views_examples_with_content_exe',
'type': 'executable',
'dependencies': [
'../../../base/base.gyp:base',
+ '../../../base/base.gyp:base_i18n',
'../../../content/content.gyp:content',
- '../../views_content_client/views_content_client.gyp:views_content_client',
+ '../../../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': [
+ '../../..',
+ ],
'sources': [
'../../../content/app/startup_helper_win.cc',
- 'examples_with_content_main_exe.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',
],
'conditions': [
['OS=="win"', {
@@ -171,6 +217,13 @@
'../../../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_delegate.cc ('k') | ui/views/examples/examples_with_content_main_exe.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698