Index: ui/views/views.gyp |
diff --git a/ui/views/views.gyp b/ui/views/views.gyp |
index 9b010e7961d23f87e52a204a244441cc0e51c455..a099de7f6ad24625e6119b43da226eb1917c5687 100644 |
--- a/ui/views/views.gyp |
+++ b/ui/views/views.gyp |
@@ -551,33 +551,6 @@ |
], |
}, # target_name: views_test_support |
{ |
- 'target_name': 'views_with_content_test_support', |
- 'type': 'static_library', |
- 'dependencies': [ |
- '../../base/base.gyp:base', |
- '../../content/content.gyp:content', |
- '../../content/content_shell_and_tests.gyp:test_support_content', |
- '../../ipc/ipc.gyp:test_support_ipc', |
- '../../skia/skia.gyp:skia', |
- '../../testing/gtest.gyp:gtest', |
- '../aura/aura.gyp:aura', |
- '../base/ui_base.gyp:ui_base', |
- '../events/events.gyp:events', |
- '../gfx/gfx.gyp:gfx', |
- '../gfx/gfx.gyp:gfx_geometry', |
- 'controls/webview/webview.gyp:webview', |
- 'views_test_support', |
- 'views', |
- ], |
- 'include_dirs': [ |
- '..', |
- ], |
- 'sources': [ |
- 'test/webview_test_helper.cc', |
- 'test/webview_test_helper.h', |
- ], |
- }, # target_name: views_with_content_test_support |
- { |
'target_name': 'views_unittests', |
'type': 'executable', |
'dependencies': [ |
@@ -718,225 +691,5 @@ |
}], |
], |
}, # target_name: views_unittests |
- { |
- 'target_name': 'views_examples_lib', |
- 'type': '<(component)', |
- 'dependencies': [ |
- '../../base/base.gyp:base', |
- '../../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', |
- '../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', |
- 'views', |
- ], |
- 'include_dirs': [ |
- '..', |
- ], |
- 'defines': [ |
- 'VIEWS_EXAMPLES_IMPLEMENTATION', |
- ], |
- 'sources': [ |
- 'examples/bubble_example.cc', |
- 'examples/bubble_example.h', |
- 'examples/button_example.cc', |
- 'examples/button_example.h', |
- 'examples/checkbox_example.cc', |
- 'examples/checkbox_example.h', |
- 'examples/combobox_example.cc', |
- 'examples/combobox_example.h', |
- 'examples/double_split_view_example.cc', |
- 'examples/double_split_view_example.h', |
- 'examples/example_base.cc', |
- 'examples/example_base.h', |
- 'examples/example_combobox_model.cc', |
- 'examples/example_combobox_model.h', |
- 'examples/examples_window.cc', |
- 'examples/examples_window.h', |
- 'examples/label_example.cc', |
- 'examples/label_example.h', |
- 'examples/link_example.cc', |
- 'examples/link_example.h', |
- 'examples/message_box_example.cc', |
- 'examples/message_box_example.h', |
- 'examples/menu_example.cc', |
- 'examples/menu_example.h', |
- 'examples/multiline_example.cc', |
- 'examples/multiline_example.h', |
- 'examples/progress_bar_example.cc', |
- 'examples/progress_bar_example.h', |
- 'examples/radio_button_example.cc', |
- 'examples/radio_button_example.h', |
- 'examples/scroll_view_example.cc', |
- 'examples/scroll_view_example.h', |
- 'examples/single_split_view_example.cc', |
- 'examples/single_split_view_example.h', |
- 'examples/slider_example.cc', |
- 'examples/slider_example.h', |
- 'examples/tabbed_pane_example.cc', |
- 'examples/tabbed_pane_example.h', |
- 'examples/table_example.cc', |
- 'examples/table_example.h', |
- 'examples/text_example.cc', |
- 'examples/text_example.h', |
- 'examples/textfield_example.cc', |
- 'examples/textfield_example.h', |
- 'examples/throbber_example.cc', |
- 'examples/throbber_example.h', |
- 'examples/tree_view_example.cc', |
- 'examples/tree_view_example.h', |
- 'examples/views_examples_export.h', |
- 'examples/widget_example.cc', |
- 'examples/widget_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_lib |
- { |
- 'target_name': 'views_examples_exe', |
- 'type': 'executable', |
- 'dependencies': [ |
- '../../base/base.gyp:base', |
- '../../base/base.gyp:base_i18n', |
- '../aura/aura.gyp:aura', |
- '../base/ui_base.gyp:ui_base', |
- '../compositor/compositor.gyp:compositor', |
- '../compositor/compositor.gyp:compositor_test_support', |
- '../gfx/gfx.gyp:gfx', |
- '../resources/ui_resources.gyp:ui_test_pak', |
- 'views', |
- 'views_examples_lib', |
- 'views_test_support', |
- ], |
- 'sources': [ |
- 'examples/examples_main.cc', |
- ], |
- }, # target_name: views_examples_exe |
- { |
- 'target_name': 'views_examples_with_content_lib', |
- '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', |
- 'views_examples_lib', |
- ], |
- 'include_dirs': [ |
- '..', |
- ], |
- 'defines': [ |
- 'VIEWS_EXAMPLES_WITH_CONTENT_IMPLEMENTATION', |
- ], |
- 'sources': [ |
- 'examples/examples_window_with_content.cc', |
- 'examples/examples_window_with_content.h', |
- 'examples/views_examples_with_content_export.h', |
- 'examples/webview_example.cc', |
- 'examples/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', |
- '../../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', |
- 'views_examples_with_content_lib', |
- 'views_test_support' |
- ], |
- 'include_dirs': [ |
- '../..', |
- ], |
- 'sources': [ |
- '../../content/app/startup_helper_win.cc', |
- 'examples/content_client/examples_browser_main_parts.cc', |
- 'examples/content_client/examples_browser_main_parts.h', |
- 'examples/content_client/examples_content_browser_client.cc', |
- 'examples/content_client/examples_content_browser_client.h', |
- 'examples/content_client/examples_main_delegate.cc', |
- 'examples/content_client/examples_main_delegate.h', |
- 'examples/content_client/examples_main.cc', |
- ], |
- 'conditions': [ |
- ['OS=="win"', { |
- 'link_settings': { |
- 'libraries': [ |
- '-limm32.lib', |
- '-loleacc.lib', |
- ] |
- }, |
- 'msvs_settings': { |
- 'VCManifestTool': { |
- 'AdditionalManifestFiles': [ |
- 'examples\\views_examples.exe.manifest', |
- ], |
- }, |
- 'VCLinkerTool': { |
- '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 |
], |
} |