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

Unified Diff: chrome/chrome_browser.gypi

Issue 8588054: Revert 110691 - Implement the status tray/icon API for ChromeOS. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/views/status_icons/status_tray_chromeos_browsertest.cc ('k') | chrome/chrome_tests.gypi » ('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 110691)
+++ chrome/chrome_browser.gypi (working copy)
@@ -3537,12 +3537,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',
@@ -4066,10 +4062,6 @@
['exclude', 'browser/renderer_host/offline_resource_handler.cc'],
['exclude', 'browser/renderer_host/offline_resource_handler.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'],
['exclude', 'browser/ui/webui/active_downloads_ui.cc'],
['exclude', 'browser/ui/webui/fileicon_source_chromeos.cc'],
['exclude', 'browser/ui/webui/fileicon_source_chromeos.h'],
@@ -4858,10 +4850,7 @@
['include', '^browser/ui/views/simple_message_box_views.h'],
['include', '^browser/ui/views/status_bubble_views.cc'],
['include', '^browser/ui/views/status_bubble_views.h'],
- ['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'],
+ ['include', '^browser/ui/views/status_icons/status_tray_linux.cc'],
['include', '^browser/ui/views/tab_contents/native_tab_contents_container_aura.cc'],
['include', '^browser/ui/views/tab_contents/native_tab_contents_container_aura.h'],
['include', '^browser/ui/views/tab_contents/native_tab_contents_container_gtk.cc'],
@@ -5170,7 +5159,6 @@
['include', '^browser/ui/views/frame/browser_non_client_frame_view_factory_aura.cc'],
['include', '^browser/ui/views/importer/import_lock_dialog_view.cc'],
['include', '^browser/ui/views/native_constrained_window_aura.cc'],
- ['include', '^browser/ui/views/status_icons/status_tray_linux.cc'],
['include', '^browser/ui/views/stubs_aura.cc'],
],
}],
@@ -5197,11 +5185,6 @@
['exclude', '^browser/chromeos/xinput_hierarchy_changed_event_listener.cc'],
['include', '^browser/ui/views/handle_web_keyboard_event_aura.cc'],
['include', '^browser/ui/views/handle_web_keyboard_event.h'],
- ['exclude', '^browser/ui/views/status_icons/status_icon_chromeos.cc'],
- ['exclude', '^browser/ui/views/status_icons/status_icon_chromeos.h'],
- ['exclude', '^browser/ui/views/status_icons/status_tray_chromeos.cc'],
- ['exclude', '^browser/ui/views/status_icons/status_tray_chromeos.h'],
- ['include', '^browser/ui/views/status_icons/status_tray_linux.cc'],
],
}],
[ 'use_openssl==1', {
« no previous file with comments | « chrome/browser/ui/views/status_icons/status_tray_chromeos_browsertest.cc ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698