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

Side by Side Diff: chrome/chrome_browser.gypi

Issue 4319003: Replace TabContentsViewGtk with TabContentsViewViews as part of the ongoing (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Applied all comments and dealt with the move from chrome/browser/views to chrome/browser/ui/views Created 10 years, 1 month 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 # Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'browser', 8 'target_name': 'browser',
9 'type': '<(library)', 9 'type': '<(library)',
10 'msvs_guid': '5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA', 10 'msvs_guid': '5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA',
(...skipping 3252 matching lines...) Expand 10 before | Expand all | Expand 10 after
3263 'browser/ui/views/tab_contents/native_tab_contents_container_win.cc', 3263 'browser/ui/views/tab_contents/native_tab_contents_container_win.cc',
3264 'browser/ui/views/tab_contents/native_tab_contents_container_win.h', 3264 'browser/ui/views/tab_contents/native_tab_contents_container_win.h',
3265 'browser/ui/views/tab_contents/render_view_context_menu_views.cc', 3265 'browser/ui/views/tab_contents/render_view_context_menu_views.cc',
3266 'browser/ui/views/tab_contents/render_view_context_menu_views.h', 3266 'browser/ui/views/tab_contents/render_view_context_menu_views.h',
3267 'browser/ui/views/tab_contents/tab_contents_drag_win.cc', 3267 'browser/ui/views/tab_contents/tab_contents_drag_win.cc',
3268 'browser/ui/views/tab_contents/tab_contents_drag_win.h', 3268 'browser/ui/views/tab_contents/tab_contents_drag_win.h',
3269 'browser/ui/views/tab_contents/tab_contents_view_gtk.cc', 3269 'browser/ui/views/tab_contents/tab_contents_view_gtk.cc',
3270 'browser/ui/views/tab_contents/tab_contents_view_gtk.h', 3270 'browser/ui/views/tab_contents/tab_contents_view_gtk.h',
3271 'browser/ui/views/tab_contents/tab_contents_view_win.cc', 3271 'browser/ui/views/tab_contents/tab_contents_view_win.cc',
3272 'browser/ui/views/tab_contents/tab_contents_view_win.h', 3272 'browser/ui/views/tab_contents/tab_contents_view_win.h',
3273 'browser/ui/views/tab_contents/tab_contents_view_views.cc',
3274 'browser/ui/views/tab_contents/tab_contents_view_views.h',
3273 'browser/ui/views/tabs/base_tab.cc', 3275 'browser/ui/views/tabs/base_tab.cc',
3274 'browser/ui/views/tabs/base_tab.h', 3276 'browser/ui/views/tabs/base_tab.h',
3275 'browser/ui/views/tabs/base_tab_strip.cc', 3277 'browser/ui/views/tabs/base_tab_strip.cc',
3276 'browser/ui/views/tabs/base_tab_strip.h', 3278 'browser/ui/views/tabs/base_tab_strip.h',
3277 'browser/ui/views/tabs/browser_tab_strip_controller.cc', 3279 'browser/ui/views/tabs/browser_tab_strip_controller.cc',
3278 'browser/ui/views/tabs/browser_tab_strip_controller.h', 3280 'browser/ui/views/tabs/browser_tab_strip_controller.h',
3279 'browser/ui/views/tabs/dragged_tab_controller.cc', 3281 'browser/ui/views/tabs/dragged_tab_controller.cc',
3280 'browser/ui/views/tabs/dragged_tab_controller.h', 3282 'browser/ui/views/tabs/dragged_tab_controller.h',
3281 'browser/ui/views/tabs/dragged_tab_view.cc', 3283 'browser/ui/views/tabs/dragged_tab_view.cc',
3282 'browser/ui/views/tabs/dragged_tab_view.h', 3284 'browser/ui/views/tabs/dragged_tab_view.h',
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
3417 'sources!': [ 3419 'sources!': [
3418 'browser/password_manager/native_backend_gnome_x.h', 3420 'browser/password_manager/native_backend_gnome_x.h',
3419 'browser/password_manager/native_backend_gnome_x.cc', 3421 'browser/password_manager/native_backend_gnome_x.cc',
3420 ], 3422 ],
3421 }], 3423 }],
3422 ['touchui==0', { 3424 ['touchui==0', {
3423 'sources!': [ 3425 'sources!': [
3424 'browser/dom_ui/keyboard_ui.cc', 3426 'browser/dom_ui/keyboard_ui.cc',
3425 'browser/dom_ui/keyboard_ui.h', 3427 'browser/dom_ui/keyboard_ui.h',
3426 'browser/renderer_host/render_widget_host_view_views.cc', 3428 'browser/renderer_host/render_widget_host_view_views.cc',
3427 'browser/renderer_host/render_widget_host_view_views.h', 3429 » 'browser/renderer_host/render_widget_host_view_views.h',
3430 » 'browser/ui/views/tab_contents/tab_contents_view_views.cc',
3431 » 'browser/ui/views/tab_contents/tab_contents_view_views.h',
oshima 2010/11/13 01:36:08 replace tabs with space
3428 ], 3432 ],
3429 }], 3433 }],
3430 ['touchui==1', { 3434 ['touchui==1', {
3431 'sources/': [ 3435 'sources/': [
3432 ['exclude', '^browser/renderer_host/render_widget_host_view_gtk.cc'] , 3436 ['exclude', '^browser/renderer_host/render_widget_host_view_gtk.cc'] ,
3433 ['exclude', '^browser/renderer_host/render_widget_host_view_gtk.h'], 3437 ['exclude', '^browser/renderer_host/render_widget_host_view_gtk.h'],
3434 ['exclude', '^browser/renderer_host/gtk_im_context_wrapper.cc'], 3438 ['exclude', '^browser/renderer_host/gtk_im_context_wrapper.cc'],
3435 ['exclude', '^browser/renderer_host/gtk_im_context_wrapper.h'], 3439 ['exclude', '^browser/renderer_host/gtk_im_context_wrapper.h'],
3440 ['exclude', '^browser/views/tab_contents/tab_contents_view_gtk.cc'],
3441 ['exclude', '^browser/views/tab_contents/tab_contents_view_gtk.h'],
3436 ], 3442 ],
3437 }], 3443 }],
3438 ['OS=="linux"', { 3444 ['OS=="linux"', {
3439 'dependencies': [ 3445 'dependencies': [
3440 '../build/linux/system.gyp:dbus-glib', 3446 '../build/linux/system.gyp:dbus-glib',
3441 '../build/linux/system.gyp:gconf', 3447 '../build/linux/system.gyp:gconf',
3442 '../build/linux/system.gyp:gtk', 3448 '../build/linux/system.gyp:gtk',
3443 '../build/linux/system.gyp:gtkprint', 3449 '../build/linux/system.gyp:gtkprint',
3444 '../build/linux/system.gyp:nss', 3450 '../build/linux/system.gyp:nss',
3445 '../third_party/undoview/undoview.gyp:undoview', 3451 '../third_party/undoview/undoview.gyp:undoview',
(...skipping 644 matching lines...) Expand 10 before | Expand all | Expand 10 after
4090 ['OS=="linux" and toolkit_views==0', { 4096 ['OS=="linux" and toolkit_views==0', {
4091 'sources/': [ 4097 'sources/': [
4092 ['include', '^browser/printing/print_dialog_gtk.cc'], 4098 ['include', '^browser/printing/print_dialog_gtk.cc'],
4093 ['include', '^browser/printing/print_dialog_gtk.h'], 4099 ['include', '^browser/printing/print_dialog_gtk.h'],
4094 ['exclude', '^browser/ui/browser_list_stub.cc'], 4100 ['exclude', '^browser/ui/browser_list_stub.cc'],
4095 ['exclude', '^browser/bookmarks/bookmark_drop_info.cc'], 4101 ['exclude', '^browser/bookmarks/bookmark_drop_info.cc'],
4096 ['exclude', '^browser/ui/views/autocomplete/autocomplete_popup_g tk.cc'], 4102 ['exclude', '^browser/ui/views/autocomplete/autocomplete_popup_g tk.cc'],
4097 ['exclude', '^browser/ui/views/autocomplete/autocomplete_popup_g tk.h'], 4103 ['exclude', '^browser/ui/views/autocomplete/autocomplete_popup_g tk.h'],
4098 ], 4104 ],
4099 }], 4105 }],
4106 # Touch build only
4107 ['OS=="linux" and toolkit_views==1 and touchui==1', {
4108 'sources/': [
4109 ['include', '^browser/ui/views/tab_contents/tab_contents_view_vi ews.cc'],
4110 ['include', '^browser/ui/views/tab_contents/tab_contents_view_vi ews.h'],
4111 ['exclude', '^browser/ui/views/tab_contents/tab_contents_view_gt k.cc'],
4112 ['exclude', '^browser/ui/views/tab_contents/tab_contents_view_gt k.h'],
4113 # TODO(anicolao): exclude these once we have DOMUI dialogs
4114 # ['exclude', '^browser/gtk/constrained_window_gtk.cc'],
4115 # ['exclude', '^browser/gtk/constrained_window_gtk.h'],
4116 ],
4117 }],
4100 ['OS=="linux" and chromeos==1',{ 4118 ['OS=="linux" and chromeos==1',{
4101 'sources/': [ 4119 'sources/': [
4102 ['exclude', '^browser/extensions/extension_tts_api_linux.cc'], 4120 ['exclude', '^browser/extensions/extension_tts_api_linux.cc'],
4103 ['exclude', '^browser/geolocation/wifi_data_provider_linux.cc'], 4121 ['exclude', '^browser/geolocation/wifi_data_provider_linux.cc'],
4104 ['exclude', '^browser/geolocation/wifi_data_provider_linux.h'], 4122 ['exclude', '^browser/geolocation/wifi_data_provider_linux.h'],
4105 ['exclude', '^browser/notifications/balloon_collection.cc'], 4123 ['exclude', '^browser/notifications/balloon_collection.cc'],
4106 ['exclude', '^browser/notifications/balloon_collection_impl.h'], 4124 ['exclude', '^browser/notifications/balloon_collection_impl.h'],
4107 ['exclude', '^browser/notifications/balloon_collection_linux.cc' ], 4125 ['exclude', '^browser/notifications/balloon_collection_linux.cc' ],
4108 ], 4126 ],
4109 'dependencies': [ 4127 'dependencies': [
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
4286 ], 4304 ],
4287 }, 4305 },
4288 ], 4306 ],
4289 } 4307 }
4290 4308
4291 # Local Variables: 4309 # Local Variables:
4292 # tab-width:2 4310 # tab-width:2
4293 # indent-tabs-mode:nil 4311 # indent-tabs-mode:nil
4294 # End: 4312 # End:
4295 # vim: set expandtab tabstop=2 shiftwidth=2: 4313 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698