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

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: Address final comments from reviewers 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
« no previous file with comments | « chrome/browser/ui/views/tab_contents/tab_contents_view_views.cc ('k') | gfx/canvas.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 3286 matching lines...) Expand 10 before | Expand all | Expand 10 after
3297 'browser/ui/views/tab_contents/native_tab_contents_container_win.cc', 3297 'browser/ui/views/tab_contents/native_tab_contents_container_win.cc',
3298 'browser/ui/views/tab_contents/native_tab_contents_container_win.h', 3298 'browser/ui/views/tab_contents/native_tab_contents_container_win.h',
3299 'browser/ui/views/tab_contents/render_view_context_menu_views.cc', 3299 'browser/ui/views/tab_contents/render_view_context_menu_views.cc',
3300 'browser/ui/views/tab_contents/render_view_context_menu_views.h', 3300 'browser/ui/views/tab_contents/render_view_context_menu_views.h',
3301 'browser/ui/views/tab_contents/tab_contents_drag_win.cc', 3301 'browser/ui/views/tab_contents/tab_contents_drag_win.cc',
3302 'browser/ui/views/tab_contents/tab_contents_drag_win.h', 3302 'browser/ui/views/tab_contents/tab_contents_drag_win.h',
3303 'browser/ui/views/tab_contents/tab_contents_view_gtk.cc', 3303 'browser/ui/views/tab_contents/tab_contents_view_gtk.cc',
3304 'browser/ui/views/tab_contents/tab_contents_view_gtk.h', 3304 'browser/ui/views/tab_contents/tab_contents_view_gtk.h',
3305 'browser/ui/views/tab_contents/tab_contents_view_win.cc', 3305 'browser/ui/views/tab_contents/tab_contents_view_win.cc',
3306 'browser/ui/views/tab_contents/tab_contents_view_win.h', 3306 'browser/ui/views/tab_contents/tab_contents_view_win.h',
3307 'browser/ui/views/tab_contents/tab_contents_view_views.cc',
3308 'browser/ui/views/tab_contents/tab_contents_view_views.h',
3307 'browser/ui/views/tabs/base_tab.cc', 3309 'browser/ui/views/tabs/base_tab.cc',
3308 'browser/ui/views/tabs/base_tab.h', 3310 'browser/ui/views/tabs/base_tab.h',
3309 'browser/ui/views/tabs/base_tab_strip.cc', 3311 'browser/ui/views/tabs/base_tab_strip.cc',
3310 'browser/ui/views/tabs/base_tab_strip.h', 3312 'browser/ui/views/tabs/base_tab_strip.h',
3311 'browser/ui/views/tabs/browser_tab_strip_controller.cc', 3313 'browser/ui/views/tabs/browser_tab_strip_controller.cc',
3312 'browser/ui/views/tabs/browser_tab_strip_controller.h', 3314 'browser/ui/views/tabs/browser_tab_strip_controller.h',
3313 'browser/ui/views/tabs/dragged_tab_controller.cc', 3315 'browser/ui/views/tabs/dragged_tab_controller.cc',
3314 'browser/ui/views/tabs/dragged_tab_controller.h', 3316 'browser/ui/views/tabs/dragged_tab_controller.h',
3315 'browser/ui/views/tabs/dragged_tab_view.cc', 3317 'browser/ui/views/tabs/dragged_tab_view.cc',
3316 'browser/ui/views/tabs/dragged_tab_view.h', 3318 'browser/ui/views/tabs/dragged_tab_view.h',
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
3428 'browser/password_manager/native_backend_kwallet_x.h', 3430 'browser/password_manager/native_backend_kwallet_x.h',
3429 'browser/password_manager/native_backend_kwallet_x.cc', 3431 'browser/password_manager/native_backend_kwallet_x.cc',
3430 'browser/platform_util_linux.cc', 3432 'browser/platform_util_linux.cc',
3431 ], 3433 ],
3432 'link_settings': { 3434 'link_settings': {
3433 'libraries': [ 3435 'libraries': [
3434 '-lpulse', 3436 '-lpulse',
3435 ], 3437 ],
3436 }, 3438 },
3437 }], 3439 }],
3438 » ['use_gconf==0', { 3440 ['use_gconf==0', {
3439 » 'sources!': [ 3441 'sources!': [
3440 'browser/gtk/gconf_titlebar_listener.cc', 3442 'browser/gtk/gconf_titlebar_listener.cc',
3441 'browser/gtk/gconf_titlebar_listener.h', 3443 'browser/gtk/gconf_titlebar_listener.h',
3442 » ], 3444 ],
3443 » }], 3445 }],
3444 ['use_gnome_keyring==0', { 3446 ['use_gnome_keyring==0', {
3445 'sources!': [ 3447 'sources!': [
3446 'browser/password_manager/native_backend_gnome_x.h', 3448 'browser/password_manager/native_backend_gnome_x.h',
3447 'browser/password_manager/native_backend_gnome_x.cc', 3449 'browser/password_manager/native_backend_gnome_x.cc',
3448 ], 3450 ],
3449 }], 3451 }],
3450 ['touchui==0', { 3452 ['touchui==0', {
3451 'sources!': [ 3453 'sources!': [
3452 'browser/dom_ui/keyboard_ui.cc', 3454 'browser/dom_ui/keyboard_ui.cc',
3453 'browser/dom_ui/keyboard_ui.h', 3455 'browser/dom_ui/keyboard_ui.h',
3454 'browser/renderer_host/render_widget_host_view_views.cc', 3456 'browser/renderer_host/render_widget_host_view_views.cc',
3455 'browser/renderer_host/render_widget_host_view_views.h', 3457 'browser/renderer_host/render_widget_host_view_views.h',
3458 'browser/ui/views/tab_contents/tab_contents_view_views.cc',
3459 'browser/ui/views/tab_contents/tab_contents_view_views.h',
3456 ], 3460 ],
3457 }], 3461 }],
3458 ['touchui==1', { 3462 ['touchui==1', {
3459 'sources/': [ 3463 'sources/': [
3460 ['exclude', '^browser/renderer_host/render_widget_host_view_gtk.cc'] , 3464 ['exclude', '^browser/renderer_host/render_widget_host_view_gtk.cc'] ,
3461 ['exclude', '^browser/renderer_host/render_widget_host_view_gtk.h'], 3465 ['exclude', '^browser/renderer_host/render_widget_host_view_gtk.h'],
3462 ['exclude', '^browser/renderer_host/gtk_im_context_wrapper.cc'], 3466 ['exclude', '^browser/renderer_host/gtk_im_context_wrapper.cc'],
3463 ['exclude', '^browser/renderer_host/gtk_im_context_wrapper.h'], 3467 ['exclude', '^browser/renderer_host/gtk_im_context_wrapper.h'],
3468 ['exclude', '^browser/views/tab_contents/tab_contents_view_gtk.cc'],
3469 ['exclude', '^browser/views/tab_contents/tab_contents_view_gtk.h'],
3464 ], 3470 ],
3465 }], 3471 }],
3466 ['OS=="linux"', { 3472 ['OS=="linux"', {
3467 'dependencies': [ 3473 'dependencies': [
3468 '../build/linux/system.gyp:dbus-glib', 3474 '../build/linux/system.gyp:dbus-glib',
3469 '../build/linux/system.gyp:gconf', 3475 '../build/linux/system.gyp:gconf',
3470 '../build/linux/system.gyp:gtk', 3476 '../build/linux/system.gyp:gtk',
3471 '../build/linux/system.gyp:gtkprint', 3477 '../build/linux/system.gyp:gtkprint',
3472 '../build/linux/system.gyp:nss', 3478 '../build/linux/system.gyp:nss',
3473 '../third_party/undoview/undoview.gyp:undoview', 3479 '../third_party/undoview/undoview.gyp:undoview',
(...skipping 652 matching lines...) Expand 10 before | Expand all | Expand 10 after
4126 ['OS=="linux" and toolkit_views==0', { 4132 ['OS=="linux" and toolkit_views==0', {
4127 'sources/': [ 4133 'sources/': [
4128 ['include', '^browser/printing/print_dialog_gtk.cc'], 4134 ['include', '^browser/printing/print_dialog_gtk.cc'],
4129 ['include', '^browser/printing/print_dialog_gtk.h'], 4135 ['include', '^browser/printing/print_dialog_gtk.h'],
4130 ['exclude', '^browser/ui/browser_list_stub.cc'], 4136 ['exclude', '^browser/ui/browser_list_stub.cc'],
4131 ['exclude', '^browser/bookmarks/bookmark_drop_info.cc'], 4137 ['exclude', '^browser/bookmarks/bookmark_drop_info.cc'],
4132 ['exclude', '^browser/ui/views/autocomplete/autocomplete_popup_g tk.cc'], 4138 ['exclude', '^browser/ui/views/autocomplete/autocomplete_popup_g tk.cc'],
4133 ['exclude', '^browser/ui/views/autocomplete/autocomplete_popup_g tk.h'], 4139 ['exclude', '^browser/ui/views/autocomplete/autocomplete_popup_g tk.h'],
4134 ], 4140 ],
4135 }], 4141 }],
4142 # Touch build only
4143 ['OS=="linux" and toolkit_views==1 and touchui==1', {
4144 'sources/': [
4145 ['include', '^browser/ui/views/tab_contents/tab_contents_view_vi ews.cc'],
4146 ['include', '^browser/ui/views/tab_contents/tab_contents_view_vi ews.h'],
4147 ['exclude', '^browser/ui/views/tab_contents/tab_contents_view_gt k.cc'],
4148 ['exclude', '^browser/ui/views/tab_contents/tab_contents_view_gt k.h'],
4149 # TODO(anicolao): exclude these once we have DOMUI dialogs
4150 # ['exclude', '^browser/gtk/constrained_window_gtk.cc'],
4151 # ['exclude', '^browser/gtk/constrained_window_gtk.h'],
4152 ],
4153 }],
4136 ['OS=="linux" and chromeos==1',{ 4154 ['OS=="linux" and chromeos==1',{
4137 'sources/': [ 4155 'sources/': [
4138 ['exclude', '^browser/extensions/extension_tts_api_linux.cc'], 4156 ['exclude', '^browser/extensions/extension_tts_api_linux.cc'],
4139 ['exclude', '^browser/geolocation/wifi_data_provider_linux.cc'], 4157 ['exclude', '^browser/geolocation/wifi_data_provider_linux.cc'],
4140 ['exclude', '^browser/geolocation/wifi_data_provider_linux.h'], 4158 ['exclude', '^browser/geolocation/wifi_data_provider_linux.h'],
4141 ['exclude', '^browser/notifications/balloon_collection.cc'], 4159 ['exclude', '^browser/notifications/balloon_collection.cc'],
4142 ['exclude', '^browser/notifications/balloon_collection_impl.h'], 4160 ['exclude', '^browser/notifications/balloon_collection_impl.h'],
4143 ['exclude', '^browser/notifications/balloon_collection_linux.cc' ], 4161 ['exclude', '^browser/notifications/balloon_collection_linux.cc' ],
4144 ], 4162 ],
4145 'dependencies': [ 4163 'dependencies': [
(...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after
4320 ], 4338 ],
4321 }, 4339 },
4322 ], 4340 ],
4323 } 4341 }
4324 4342
4325 # Local Variables: 4343 # Local Variables:
4326 # tab-width:2 4344 # tab-width:2
4327 # indent-tabs-mode:nil 4345 # indent-tabs-mode:nil
4328 # End: 4346 # End:
4329 # vim: set expandtab tabstop=2 shiftwidth=2: 4347 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/tab_contents/tab_contents_view_views.cc ('k') | gfx/canvas.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698