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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/chrome_browser.gypi

Issue 9717014: More chrome_browser.gypi cleanup once chromeos_gtk is gone. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 9 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/status_icons/status_tray_chromeos.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_browser.gypi
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 0aba6daac0b1b36ac4b87ea441d2333cb44d14e3..d1c4ab115cb6b51a5e5cfdf0e29ba01af0ef6673 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -3500,12 +3500,8 @@
'browser/ui/views/ssl_client_certificate_selector.h',
'browser/ui/views/status_bubble_views.cc',
'browser/ui/views/status_bubble_views.h',
- 'browser/ui/views/status_icons/status_icon_chromeos.cc',
- 'browser/ui/views/status_icons/status_icon_chromeos.h',
'browser/ui/views/status_icons/status_icon_win.cc',
'browser/ui/views/status_icons/status_icon_win.h',
- 'browser/ui/views/status_icons/status_tray_chromeos.cc',
- 'browser/ui/views/status_icons/status_tray_chromeos.h',
'browser/ui/views/status_icons/status_tray_linux.cc',
'browser/ui/views/status_icons/status_tray_win.cc',
'browser/ui/views/status_icons/status_tray_win.h',
@@ -4158,10 +4154,6 @@
['exclude', 'browser/renderer_host/offline_resource_throttle.cc'],
['exclude', 'browser/renderer_host/offline_resource_throttle.h'],
['exclude', 'browser/ui/toolbar/wrench_menu_model_chromeos.cc'],
- ['exclude', 'browser/ui/views/status_icons/status_tray_chromeos.cc'],
- ['exclude', 'browser/ui/views/status_icons/status_tray_chromeos.h'],
- ['exclude', 'browser/ui/views/status_icons/status_icon_chromeos.cc'],
- ['exclude', 'browser/ui/views/status_icons/status_icon_chromeos.h'],
],
}, { # chromeos==1
'dependencies': [
@@ -4172,7 +4164,6 @@
'power_supply_properties_proto',
],
'sources!': [
- 'browser/background/background_mode_manager_gtk.cc',
'browser/first_run/upgrade_util.cc',
'browser/first_run/upgrade_util.h',
'browser/first_run/upgrade_util_linux.cc',
@@ -4184,10 +4175,6 @@
'browser/password_manager/native_backend_kwallet_x.cc',
'browser/password_manager/native_backend_kwallet_x.h',
'browser/platform_util_linux.cc',
- 'browser/printing/print_dialog_gtk.cc',
- 'browser/printing/print_dialog_gtk.h',
- 'browser/ui/gtk/tab_modal_confirm_dialog_gtk.cc',
- 'browser/ui/gtk/tab_modal_confirm_dialog_gtk.h',
'browser/ui/sync/one_click_signin_dialog.h',
'browser/ui/sync/one_click_signin_helper.cc',
'browser/ui/sync/one_click_signin_helper.h',
@@ -5078,16 +5065,6 @@
['exclude', '^browser/ui/views/keyboard_overlay_dialog_view.h'],
],
}],
- # Include the chromeos status tray/icon only for non-aura builds.
- ['OS=="linux" and toolkit_views==1 and chromeos==1 and use_aura==0', {
- 'sources/': [
- ['include', '^browser/ui/views/status_icons/status_icon_chromeos.cc'],
- ['include', '^browser/ui/views/status_icons/status_icon_chromeos.h'],
- ['include', '^browser/ui/views/status_icons/status_tray_chromeos.cc'],
- ['include', '^browser/ui/views/status_icons/status_tray_chromeos.h'],
- ['exclude', '^browser/ui/views/status_icons/status_tray_linux.cc'],
- ],
- }],
# GTK build only
['toolkit_uses_gtk == 1 and toolkit_views == 0', {
'sources/': [
@@ -5106,39 +5083,8 @@
'browser/ui/toolbar/bookmark_sub_menu_model.cc',
],
}],
- ['chromeos==1 and use_aura==0', {
- 'sources/': [
- ['exclude', '^browser/chromeos/legacy_window_manager/initial_browser_window_observer.cc'],
- ['exclude', '^browser/chromeos/legacy_window_manager/initial_browser_window_observer.h'],
- ['exclude', '^browser/chromeos/power/power_button_controller_delegate_chromeos.cc'],
- ['exclude', '^browser/chromeos/power/power_button_controller_delegate_chromeos.h'],
- ['exclude', '^browser/chromeos/power/power_button_observer.cc'],
- ['exclude', '^browser/chromeos/power/power_button_observer.h'],
- ['exclude', '^browser/chromeos/power/video_property_writer.cc'],
- ['exclude', '^browser/chromeos/power/video_property_writer.h'],
- ['exclude', '^browser/download/download_shelf.h'],
- ['exclude', '^browser/notifications/balloon_collection_impl.cc'],
- ['exclude', '^browser/notifications/balloon_collection_impl.h'],
- ['exclude', '^browser/notifications/balloon_collection_views.cc'],
- ['exclude', '^browser/ui/views/download/download_item_view.cc'],
- ['exclude', '^browser/ui/views/download/download_item_view.h'],
- ['exclude', '^browser/ui/views/download/download_shelf_context_menu_view.cc'],
- ['exclude', '^browser/ui/views/download/download_shelf_context_menu_view.h'],
- ['exclude', '^browser/ui/views/download/download_shelf_view.cc'],
- ['exclude', '^browser/ui/views/download/download_shelf_view.h'],
- ['exclude', '^browser/ui/webui/certificate_viewer_webui.cc'],
- ['exclude', '^browser/ui/webui/certificate_viewer_webui.h'],
- ['exclude', '^browser/ui/webui/certificate_viewer_ui.cc'],
- ['exclude', '^browser/ui/webui/certificate_viewer_ui.h'],
- ['include', '^browser/ui/webui/tab_modal_confirm_dialog_webui.cc'],
- ['include', '^browser/ui/webui/tab_modal_confirm_dialog_webui.h'],
- ],
- }],
['chromeos==1',{
'sources/': [
- ['include', '^browser/ui/gtk/omnibox/omnibox_view_gtk.cc'],
- ['include', '^browser/ui/gtk/omnibox/omnibox_view_gtk.h'],
- ['include', '^browser/ui/gtk/simple_message_box_gtk.cc'],
['include', '^browser/ui/views/omnibox/omnibox_view_views.cc'],
['include', '^browser/ui/views/omnibox/omnibox_view_views.h'],
['exclude', '^browser/notifications/balloon_collection_gtk.cc'],
« no previous file with comments | « chrome/browser/ui/views/status_icons/status_tray_chromeos.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698