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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/chrome_browser.gypi

Issue 7015051: Re-land: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 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
« no previous file with comments | « chrome/browser/ui/views/theme_install_bubble_view.cc ('k') | chrome/test/interactive_ui/view_event_test_base.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_browser.gypi
===================================================================
--- chrome/chrome_browser.gypi (revision 85284)
+++ chrome/chrome_browser.gypi (working copy)
@@ -410,8 +410,6 @@
'browser/chromeos/external_metrics.h',
'browser/chromeos/external_protocol_dialog.cc',
'browser/chromeos/external_protocol_dialog.h',
- 'browser/chromeos/frame/browser_frame_chromeos.cc',
- 'browser/chromeos/frame/browser_frame_chromeos.h',
'browser/chromeos/frame/browser_frame_view_chromeos.cc',
'browser/chromeos/frame/browser_frame_view_chromeos.h',
'browser/chromeos/frame/browser_non_client_frame_view_factory_chromeos.cc',
@@ -2871,10 +2869,6 @@
'browser/ui/views/appcache_info_view.h',
'browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc',
'browser/ui/views/autocomplete/autocomplete_popup_contents_view.h',
- 'browser/ui/views/autocomplete/autocomplete_popup_gtk.cc',
- 'browser/ui/views/autocomplete/autocomplete_popup_gtk.h',
- 'browser/ui/views/autocomplete/autocomplete_popup_win.cc',
- 'browser/ui/views/autocomplete/autocomplete_popup_win.h',
'browser/ui/views/autocomplete/autocomplete_result_view.cc',
'browser/ui/views/autocomplete/autocomplete_result_view.h',
'browser/ui/views/autocomplete/touch_autocomplete_popup_contents_view.cc',
@@ -3137,6 +3131,8 @@
'browser/ui/views/tab_contents/native_tab_contents_container_win.h',
'browser/ui/views/tab_contents/native_tab_contents_view.h',
'browser/ui/views/tab_contents/native_tab_contents_view_delegate.h',
+ 'browser/ui/views/tab_contents/native_tab_contents_view_gtk.cc',
+ 'browser/ui/views/tab_contents/native_tab_contents_view_gtk.h',
'browser/ui/views/tab_contents/native_tab_contents_view_win.cc',
'browser/ui/views/tab_contents/native_tab_contents_view_win.h',
'browser/ui/views/tab_contents/render_view_context_menu_views.cc',
@@ -3149,8 +3145,6 @@
'browser/ui/views/tab_contents/tab_contents_container_views.h',
'browser/ui/views/tab_contents/tab_contents_drag_win.cc',
'browser/ui/views/tab_contents/tab_contents_drag_win.h',
- 'browser/ui/views/tab_contents/tab_contents_view_gtk.cc',
- 'browser/ui/views/tab_contents/tab_contents_view_gtk.h',
'browser/ui/views/tab_contents/tab_contents_view_touch.cc',
'browser/ui/views/tab_contents/tab_contents_view_touch.h',
'browser/ui/views/tab_contents/tab_contents_view_views.cc',
@@ -3570,8 +3564,6 @@
['exclude', '^browser/renderer_host/render_widget_host_view_gtk.h'],
['exclude', '^browser/ui/views/frame/browser_non_client_frame_view_factory_gtk.cc'],
['exclude', '^browser/ui/views/handle_web_keyboard_event_gtk.cc'],
- ['exclude', '^browser/views/tab_contents/tab_contents_view_gtk.cc'],
- ['exclude', '^browser/views/tab_contents/tab_contents_view_gtk.h'],
['exclude', '^browser/chromeos/input_method/candidate_window.cc'],
['exclude', '^browser/chromeos/input_method/candidate_window.h'],
],
@@ -4146,14 +4138,18 @@
['include', '^browser/ui/views/status_icons/status_tray_gtk.cc'],
['include', '^browser/ui/views/tab_contents/native_tab_contents_container_gtk.cc'],
['include', '^browser/ui/views/tab_contents/native_tab_contents_container_gtk.h'],
+ ['include', '^browser/ui/views/tab_contents/native_tab_contents_view_gtk.cc'],
+ ['include', '^browser/ui/views/tab_contents/native_tab_contents_view_gtk.h'],
+ ['include', '^browser/ui/views/tab_contents/native_tab_contents_view.h'],
+ ['include', '^browser/ui/views/tab_contents/native_tab_contents_view_delegate.h'],
['include', '^browser/ui/views/tab_contents/render_view_context_menu_views.cc'],
['include', '^browser/ui/views/tab_contents/render_view_context_menu_views.h'],
['include', '^browser/ui/views/tab_contents/tab_contents_container.cc'],
['include', '^browser/ui/views/tab_contents/tab_contents_container.h'],
['include', '^browser/ui/views/tab_contents/tab_contents_container_native.cc'],
['include', '^browser/ui/views/tab_contents/tab_contents_container_native.h'],
- ['include', '^browser/ui/views/tab_contents/tab_contents_view_gtk.cc'],
- ['include', '^browser/ui/views/tab_contents/tab_contents_view_gtk.h'],
+ ['include', '^browser/ui/views/tab_contents/tab_contents_view_views.cc'],
+ ['include', '^browser/ui/views/tab_contents/tab_contents_view_views.h'],
['include', '^browser/ui/views/tab_icon_view.cc'],
['include', '^browser/ui/views/tab_icon_view.h'],
['include', '^browser/ui/views/tabs/abstract_tab_strip_view.h'],
@@ -4290,8 +4286,6 @@
['exclude', '^browser/ui/views/tabs/tab_strip_factory.cc'],
['exclude', '^browser/ui/views/tab_contents/tab_contents_container_native.cc'],
['exclude', '^browser/ui/views/tab_contents/tab_contents_container_native.h'],
- ['exclude', '^browser/ui/views/tab_contents/tab_contents_view_gtk.cc'],
- ['exclude', '^browser/ui/views/tab_contents/tab_contents_view_gtk.h'],
],
}],
['OS=="linux" and chromeos==1',{
« no previous file with comments | « chrome/browser/ui/views/theme_install_bubble_view.cc ('k') | chrome/test/interactive_ui/view_event_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698