| Index: chrome/chrome.gyp
|
| ===================================================================
|
| --- chrome/chrome.gyp (revision 16400)
|
| +++ chrome/chrome.gyp (working copy)
|
| @@ -1551,13 +1551,13 @@
|
| 'third_party/wtl/include',
|
| ],
|
| 'dependencies': [
|
| - 'views',
|
| '../google_update/google_update.gyp:google_update',
|
| 'installer/installer.gyp:installer_util',
|
| '../printing/printing.gyp:printing',
|
| + '../views/views.gyp:views',
|
| ],
|
| 'export_dependent_settings': [
|
| - 'views',
|
| + '../views/views.gyp:views',
|
| ],
|
| 'sources': [
|
| # Using built-in rule in vstudio for midl.
|
| @@ -1973,8 +1973,8 @@
|
| }],
|
| ['OS=="linux" and toolkit_views==1', {
|
| 'dependencies': [
|
| - 'views',
|
| - ],
|
| + '../views/views.gyp:views',
|
| + ],
|
| }],
|
| ['OS=="mac"', {
|
| # 'branding' is a variable defined in common.gypi
|
| @@ -2070,10 +2070,10 @@
|
| 'third_party/wtl/include',
|
| ],
|
| 'dependencies': [
|
| - 'views',
|
| '../breakpad/breakpad.gyp:breakpad_handler',
|
| '../breakpad/breakpad.gyp:breakpad_sender',
|
| '../sandbox/sandbox.gyp:sandbox',
|
| + '../views/views.gyp:views',
|
| 'worker',
|
| ],
|
| },{ # 'OS!="win"
|
| @@ -2480,7 +2480,7 @@
|
| }],
|
| ['OS=="linux" and toolkit_views==1', {
|
| 'dependencies': [
|
| - 'views',
|
| + '../views/views.gyp:views',
|
| ],
|
| }],
|
| ],
|
| @@ -2577,7 +2577,7 @@
|
| }],
|
| ['OS=="linux" and toolkit_views==1', {
|
| 'dependencies': [
|
| - 'views',
|
| + '../views/views.gyp:views',
|
| ],
|
| }],
|
| ['OS=="mac"', {
|
| @@ -2605,7 +2605,7 @@
|
| ],
|
| 'dependencies': [
|
| '../google_update/google_update.gyp:google_update',
|
| - 'views',
|
| + '../views/views.gyp:views',
|
| ],
|
| 'link_settings': {
|
| 'libraries': [
|
| @@ -2867,7 +2867,7 @@
|
| }],
|
| ['OS=="linux" and toolkit_views==1', {
|
| 'dependencies': [
|
| - 'views',
|
| + '../views/views.gyp:views',
|
| ],
|
| }],
|
| ['OS=="mac"', {
|
| @@ -2910,7 +2910,7 @@
|
| 'common/net/url_util_unittest.cc',
|
| ],
|
| 'dependencies': [
|
| - 'views',
|
| + '../views/views.gyp:views',
|
| ],
|
| }, { # else: OS != "win"
|
| 'sources!': [
|
| @@ -2977,7 +2977,7 @@
|
| }],
|
| ['OS=="linux" and toolkit_views==1', {
|
| 'dependencies': [
|
| - 'views',
|
| + '../views/views.gyp:views',
|
| ],
|
| }],
|
| ],
|
| @@ -3009,7 +3009,7 @@
|
| }],
|
| ['OS=="win" or (OS=="linux" and toolkit_views==1)', {
|
| 'dependencies': [
|
| - 'views',
|
| + '../views/views.gyp:views',
|
| ],
|
| }],
|
| ['OS!="win"', {
|
| @@ -3160,259 +3160,13 @@
|
| }],
|
| ['OS=="win" or (OS=="linux" and toolkit_views==1)', {
|
| 'dependencies': [
|
| - 'views',
|
| + '../views/views.gyp:views',
|
| ],
|
| }],
|
| ],
|
| },
|
| ],
|
| }], # OS!="mac"
|
| - ['OS=="win" or (OS=="linux" and toolkit_views==1)',
|
| - { 'targets': [
|
| - {
|
| - 'target_name': 'views',
|
| - 'type': '<(library)',
|
| - 'dependencies': [
|
| - 'common',
|
| - 'chrome_resources',
|
| - 'chrome_strings',
|
| - 'theme_resources',
|
| - '../media/media.gyp:media',
|
| - '../skia/skia.gyp:skia',
|
| - '../third_party/icu38/icu38.gyp:icui18n',
|
| - '../third_party/icu38/icu38.gyp:icuuc',
|
| - '../third_party/libxml/libxml.gyp:libxml',
|
| - '../third_party/npapi/npapi.gyp:npapi',
|
| - 'third_party/hunspell/hunspell.gyp:hunspell',
|
| - '../webkit/webkit.gyp:glue',
|
| - ],
|
| - 'sources': [
|
| - # All .cc, .h under views, except unittests
|
| - '../views/accelerator.cc',
|
| - '../views/accelerator.h',
|
| - '../views/accessibility/accessibility_types.h',
|
| - '../views/accessibility/view_accessibility.cc',
|
| - '../views/accessibility/view_accessibility.h',
|
| - '../views/accessibility/view_accessibility_wrapper.cc',
|
| - '../views/accessibility/view_accessibility_wrapper.h',
|
| - '../views/background.cc',
|
| - '../views/background.h',
|
| - '../views/border.cc',
|
| - '../views/border.h',
|
| - '../views/controls/button/button.cc',
|
| - '../views/controls/button/button.h',
|
| - '../views/controls/button/button_dropdown.cc',
|
| - '../views/controls/button/button_dropdown.h',
|
| - '../views/controls/button/checkbox.cc',
|
| - '../views/controls/button/checkbox.h',
|
| - '../views/controls/button/custom_button.cc',
|
| - '../views/controls/button/custom_button.h',
|
| - '../views/controls/button/image_button.cc',
|
| - '../views/controls/button/image_button.h',
|
| - '../views/controls/button/menu_button.cc',
|
| - '../views/controls/button/menu_button.h',
|
| - '../views/controls/button/native_button.cc',
|
| - '../views/controls/button/native_button.h',
|
| - '../views/controls/button/native_button_gtk.cc',
|
| - '../views/controls/button/native_button_gtk.h',
|
| - '../views/controls/button/native_button_win.cc',
|
| - '../views/controls/button/native_button_win.h',
|
| - '../views/controls/button/native_button_wrapper.h',
|
| - '../views/controls/button/radio_button.cc',
|
| - '../views/controls/button/radio_button.h',
|
| - '../views/controls/button/text_button.cc',
|
| - '../views/controls/button/text_button.h',
|
| - '../views/controls/combo_box.cc',
|
| - '../views/controls/combo_box.h',
|
| - '../views/controls/hwnd_view.cc',
|
| - '../views/controls/hwnd_view.h',
|
| - '../views/controls/image_view.cc',
|
| - '../views/controls/image_view.h',
|
| - '../views/controls/label.cc',
|
| - '../views/controls/label.h',
|
| - '../views/controls/link.cc',
|
| - '../views/controls/link.h',
|
| - '../views/controls/menu/chrome_menu.cc',
|
| - '../views/controls/menu/chrome_menu.h',
|
| - '../views/controls/menu/controller.h',
|
| - '../views/controls/menu/menu.cc',
|
| - '../views/controls/menu/menu.h',
|
| - '../views/controls/menu/menu_win.cc',
|
| - '../views/controls/menu/menu_win.h',
|
| - '../views/controls/menu/view_menu_delegate.h',
|
| - '../views/controls/message_box_view.cc',
|
| - '../views/controls/message_box_view.h',
|
| - '../views/controls/native_control.cc',
|
| - '../views/controls/native_control.h',
|
| - '../views/controls/native_control_gtk.cc',
|
| - '../views/controls/native_control_gtk.h',
|
| - '../views/controls/native_control_win.cc',
|
| - '../views/controls/native_control_win.h',
|
| - '../views/controls/native_view_host.cc',
|
| - '../views/controls/native_view_host.h',
|
| - '../views/controls/native_view_host_gtk.cc',
|
| - '../views/controls/native_view_host_gtk.h',
|
| - '../views/controls/scroll_view.cc',
|
| - '../views/controls/scroll_view.h',
|
| - '../views/controls/scrollbar/bitmap_scroll_bar.cc',
|
| - '../views/controls/scrollbar/bitmap_scroll_bar.h',
|
| - '../views/controls/scrollbar/native_scroll_bar.cc',
|
| - '../views/controls/scrollbar/native_scroll_bar.h',
|
| - '../views/controls/scrollbar/scroll_bar.cc',
|
| - '../views/controls/scrollbar/scroll_bar.h',
|
| - '../views/controls/separator.cc',
|
| - '../views/controls/separator.h',
|
| - '../views/controls/single_split_view.cc',
|
| - '../views/controls/single_split_view.h',
|
| - '../views/controls/tabbed_pane.cc',
|
| - '../views/controls/tabbed_pane.h',
|
| - '../views/controls/table/group_table_view.cc',
|
| - '../views/controls/table/group_table_view.h',
|
| - '../views/controls/table/table_view.cc',
|
| - '../views/controls/table/table_view.h',
|
| - '../views/controls/text_field.cc',
|
| - '../views/controls/text_field.h',
|
| - '../views/controls/throbber.cc',
|
| - '../views/controls/throbber.h',
|
| - '../views/controls/tree/tree_view.cc',
|
| - '../views/controls/tree/tree_view.h',
|
| - '../views/drag_utils.cc',
|
| - '../views/drag_utils.h',
|
| - '../views/event.cc',
|
| - '../views/event.h',
|
| - '../views/event_gtk.cc',
|
| - '../views/event_win.cc',
|
| - '../views/fill_layout.cc',
|
| - '../views/fill_layout.h',
|
| - '../views/focus/external_focus_tracker.cc',
|
| - '../views/focus/external_focus_tracker.h',
|
| - '../views/focus/focus_manager.cc',
|
| - '../views/focus/focus_manager.h',
|
| - '../views/focus/focus_util_win.cc',
|
| - '../views/focus/focus_util_win.h',
|
| - '../views/focus/view_storage.cc',
|
| - '../views/focus/view_storage.h',
|
| - '../views/grid_layout.cc',
|
| - '../views/grid_layout.h',
|
| - '../views/layout_manager.cc',
|
| - '../views/layout_manager.h',
|
| - '../views/painter.cc',
|
| - '../views/painter.h',
|
| - '../views/repeat_controller.cc',
|
| - '../views/repeat_controller.h',
|
| - '../views/standard_layout.h',
|
| - '../views/view.cc',
|
| - '../views/view.h',
|
| - '../views/view_constants.cc',
|
| - '../views/view_constants.h',
|
| - '../views/view_gtk.cc',
|
| - '../views/view_win.cc',
|
| - '../views/widget/accelerator_handler.cc',
|
| - '../views/widget/accelerator_handler.h',
|
| - '../views/widget/aero_tooltip_manager.cc',
|
| - '../views/widget/aero_tooltip_manager.h',
|
| - '../views/widget/default_theme_provider.cc',
|
| - '../views/widget/default_theme_provider.h',
|
| - '../views/widget/root_view.cc',
|
| - '../views/widget/root_view.h',
|
| - '../views/widget/root_view_drop_target.cc',
|
| - '../views/widget/root_view_drop_target.h',
|
| - '../views/widget/root_view_gtk.cc',
|
| - '../views/widget/root_view_win.cc',
|
| - '../views/widget/tooltip_manager.cc',
|
| - '../views/widget/tooltip_manager.h',
|
| - '../views/widget/widget.h',
|
| - '../views/widget/widget_gtk.cc',
|
| - '../views/widget/widget_gtk.h',
|
| - '../views/widget/widget_win.cc',
|
| - '../views/widget/widget_win.h',
|
| - '../views/window/client_view.cc',
|
| - '../views/window/client_view.h',
|
| - '../views/window/custom_frame_view.cc',
|
| - '../views/window/custom_frame_view.h',
|
| - '../views/window/dialog_client_view.cc',
|
| - '../views/window/dialog_client_view.h',
|
| - '../views/window/dialog_delegate.cc',
|
| - '../views/window/dialog_delegate.h',
|
| - '../views/window/native_frame_view.cc',
|
| - '../views/window/native_frame_view.h',
|
| - '../views/window/non_client_view.cc',
|
| - '../views/window/non_client_view.h',
|
| - '../views/window/window.h',
|
| - '../views/window/window_delegate.h',
|
| - '../views/window/window_delegate.cc',
|
| - '../views/window/window_resources.h',
|
| - '../views/window/window_gtk.cc',
|
| - '../views/window/window_gtk.h',
|
| - '../views/window/window_win.cc',
|
| - '../views/window/window_win.h',
|
| - ],
|
| - 'conditions': [
|
| - ['OS=="linux"', {
|
| - 'dependencies': [
|
| - '../build/linux/system.gyp:gtk',
|
| - ],
|
| - 'sources!': [
|
| - '../views/accelerator.cc',
|
| - '../views/accessibility/accessible_wrapper.cc',
|
| - '../views/accessibility/view_accessibility.cc',
|
| - '../views/accessibility/view_accessibility_wrapper.cc',
|
| - '../views/controls/scrollbar/bitmap_scroll_bar.cc',
|
| - '../views/controls/button/button_dropdown.cc',
|
| - '../views/controls/button/menu_button.cc',
|
| - '../views/controls/button/radio_button.cc',
|
| - '../views/controls/combo_box.cc',
|
| - '../views/controls/hwnd_view.cc',
|
| - '../views/controls/link.cc',
|
| - '../views/controls/menu/chrome_menu.cc',
|
| - '../views/controls/menu/menu.cc',
|
| - '../views/controls/message_box_view.cc',
|
| - '../views/controls/scroll_view.cc',
|
| - '../views/controls/table/group_table_view.cc',
|
| - '../views/focus/external_focus_tracker.cc',
|
| - '../views/focus/focus_manager.cc',
|
| - '../views/controls/native_control.cc',
|
| - '../views/controls/scrollbar/native_scroll_bar.cc',
|
| - '../views/controls/button/radio_button.cc',
|
| - '../views/resize_corner.cc',
|
| - '../views/controls/separator.cc',
|
| - '../views/controls/single_split_view.cc',
|
| - '../views/controls/tabbed_pane.cc',
|
| - '../views/controls/table/table_view.cc',
|
| - '../views/controls/table/group_table_view.cc',
|
| - '../views/controls/text_field.cc',
|
| - '../views/controls/tree/tree_view.cc',
|
| - '../views/event_win.cc',
|
| - '../views/widget/accelerator_handler.cc',
|
| - '../views/widget/aero_tooltip_manager.cc',
|
| - '../views/widget/root_view_drop_target.cc',
|
| - '../views/widget/tooltip_manager.cc',
|
| - '../views/window/dialog_delegate.cc',
|
| - '../views/window/dialog_client_view.cc',
|
| - '../views/window/hit_test.cc',
|
| - '../views/window/native_frame_view.cc',
|
| - '../views/widget/widget_win.cc',
|
| - ],
|
| - }],
|
| - ['OS=="win"', {
|
| - 'defines': [
|
| - '__STD_C',
|
| - '_CRT_SECURE_NO_DEPRECATE',
|
| - '_SCL_SECURE_NO_DEPRECATE',
|
| - ],
|
| - 'include_dirs': [
|
| - 'third_party/wtl/include',
|
| - ],
|
| - }, { # OS != "win"
|
| - 'sources!': [
|
| - '../views/drag_utils.cc',
|
| - '../views/drag_utils.h',
|
| - ],
|
| - }],
|
| - ],
|
| - },
|
| - ],
|
| - }], # OS=="win" or OS=="linux"
|
| ['OS=="win"',
|
| { 'targets': [
|
| {
|
| @@ -3424,7 +3178,6 @@
|
| 'test_support_common',
|
| 'test_support_ui',
|
| 'third_party/hunspell/hunspell.gyp:hunspell',
|
| - 'views',
|
| '../skia/skia.gyp:skia',
|
| '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
|
| '../third_party/icu38/icu38.gyp:icui18n',
|
| @@ -3433,6 +3186,7 @@
|
| '../third_party/zlib/zlib.gyp:zlib',
|
| '../testing/gtest.gyp:gtest',
|
| '../third_party/npapi/npapi.gyp:npapi',
|
| + '../views/views.gyp:views',
|
| ],
|
| 'include_dirs': [
|
| '..',
|
|
|
Chromium Code Reviews
