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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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': 'static_library', 9 'type': 'static_library',
10 'dependencies': [ 10 'dependencies': [
(...skipping 3519 matching lines...) Expand 10 before | Expand all | Expand 10 after
3530 'browser/ui/views/select_file_dialog_extension.cc', 3530 'browser/ui/views/select_file_dialog_extension.cc',
3531 'browser/ui/views/select_file_dialog_extension.h', 3531 'browser/ui/views/select_file_dialog_extension.h',
3532 'browser/ui/views/select_file_dialog_win.cc', 3532 'browser/ui/views/select_file_dialog_win.cc',
3533 'browser/ui/views/simple_message_box_win.cc', 3533 'browser/ui/views/simple_message_box_win.cc',
3534 'browser/ui/views/simple_message_box_views.cc', 3534 'browser/ui/views/simple_message_box_views.cc',
3535 'browser/ui/views/simple_message_box_views.h', 3535 'browser/ui/views/simple_message_box_views.h',
3536 'browser/ui/views/ssl_client_certificate_selector.cc', 3536 'browser/ui/views/ssl_client_certificate_selector.cc',
3537 'browser/ui/views/ssl_client_certificate_selector.h', 3537 'browser/ui/views/ssl_client_certificate_selector.h',
3538 'browser/ui/views/status_bubble_views.cc', 3538 'browser/ui/views/status_bubble_views.cc',
3539 'browser/ui/views/status_bubble_views.h', 3539 'browser/ui/views/status_bubble_views.h',
3540 'browser/ui/views/status_icons/status_icon_chromeos.cc',
3541 'browser/ui/views/status_icons/status_icon_chromeos.h',
3542 'browser/ui/views/status_icons/status_icon_win.cc', 3540 'browser/ui/views/status_icons/status_icon_win.cc',
3543 'browser/ui/views/status_icons/status_icon_win.h', 3541 'browser/ui/views/status_icons/status_icon_win.h',
3544 'browser/ui/views/status_icons/status_tray_chromeos.cc',
3545 'browser/ui/views/status_icons/status_tray_chromeos.h',
3546 'browser/ui/views/status_icons/status_tray_linux.cc', 3542 'browser/ui/views/status_icons/status_tray_linux.cc',
3547 'browser/ui/views/status_icons/status_tray_win.cc', 3543 'browser/ui/views/status_icons/status_tray_win.cc',
3548 'browser/ui/views/status_icons/status_tray_win.h', 3544 'browser/ui/views/status_icons/status_tray_win.h',
3549 'browser/ui/views/stubs_aura.cc', 3545 'browser/ui/views/stubs_aura.cc',
3550 'browser/ui/views/tab_contents/native_tab_contents_container.h', 3546 'browser/ui/views/tab_contents/native_tab_contents_container.h',
3551 'browser/ui/views/tab_contents/native_tab_contents_container_aura.cc', 3547 'browser/ui/views/tab_contents/native_tab_contents_container_aura.cc',
3552 'browser/ui/views/tab_contents/native_tab_contents_container_aura.h', 3548 'browser/ui/views/tab_contents/native_tab_contents_container_aura.h',
3553 'browser/ui/views/tab_contents/native_tab_contents_container_gtk.cc', 3549 'browser/ui/views/tab_contents/native_tab_contents_container_gtk.cc',
3554 'browser/ui/views/tab_contents/native_tab_contents_container_gtk.h', 3550 'browser/ui/views/tab_contents/native_tab_contents_container_gtk.h',
3555 'browser/ui/views/tab_contents/native_tab_contents_container_views.cc', 3551 'browser/ui/views/tab_contents/native_tab_contents_container_views.cc',
(...skipping 503 matching lines...) Expand 10 before | Expand all | Expand 10 after
4059 ['exclude', 'browser/policy/device_policy_cache.h'], 4055 ['exclude', 'browser/policy/device_policy_cache.h'],
4060 ['exclude', 'browser/policy/enterprise_install_attributes.cc'], 4056 ['exclude', 'browser/policy/enterprise_install_attributes.cc'],
4061 ['exclude', 'browser/policy/enterprise_install_attributes.h'], 4057 ['exclude', 'browser/policy/enterprise_install_attributes.h'],
4062 ['exclude', 'browser/policy/network_configuration_updater.cc'], 4058 ['exclude', 'browser/policy/network_configuration_updater.cc'],
4063 ['exclude', 'browser/policy/network_configuration_updater.h'], 4059 ['exclude', 'browser/policy/network_configuration_updater.h'],
4064 ['exclude', 'browser/policy/proto/chrome_device_policy.pb.cc'], 4060 ['exclude', 'browser/policy/proto/chrome_device_policy.pb.cc'],
4065 ['exclude', 'browser/policy/proto/chrome_device_policy.pb.h'], 4061 ['exclude', 'browser/policy/proto/chrome_device_policy.pb.h'],
4066 ['exclude', 'browser/renderer_host/offline_resource_handler.cc'], 4062 ['exclude', 'browser/renderer_host/offline_resource_handler.cc'],
4067 ['exclude', 'browser/renderer_host/offline_resource_handler.h'], 4063 ['exclude', 'browser/renderer_host/offline_resource_handler.h'],
4068 ['exclude', 'browser/ui/toolbar/wrench_menu_model_chromeos.cc'], 4064 ['exclude', 'browser/ui/toolbar/wrench_menu_model_chromeos.cc'],
4069 ['exclude', 'browser/ui/views/status_icons/status_tray_chromeos.cc'] ,
4070 ['exclude', 'browser/ui/views/status_icons/status_tray_chromeos.h'],
4071 ['exclude', 'browser/ui/views/status_icons/status_icon_chromeos.cc'] ,
4072 ['exclude', 'browser/ui/views/status_icons/status_icon_chromeos.h'],
4073 ['exclude', 'browser/ui/webui/active_downloads_ui.cc'], 4065 ['exclude', 'browser/ui/webui/active_downloads_ui.cc'],
4074 ['exclude', 'browser/ui/webui/fileicon_source_chromeos.cc'], 4066 ['exclude', 'browser/ui/webui/fileicon_source_chromeos.cc'],
4075 ['exclude', 'browser/ui/webui/fileicon_source_chromeos.h'], 4067 ['exclude', 'browser/ui/webui/fileicon_source_chromeos.h'],
4076 ], 4068 ],
4077 }], 4069 }],
4078 ['chromeos==1', { 4070 ['chromeos==1', {
4079 'dependencies': [ 4071 'dependencies': [
4080 '../build/linux/system.gyp:dbus-glib', 4072 '../build/linux/system.gyp:dbus-glib',
4081 '../third_party/libevent/libevent.gyp:libevent', 4073 '../third_party/libevent/libevent.gyp:libevent',
4082 'browser/chromeos/input_method/input_method.gyp:gencode', 4074 'browser/chromeos/input_method/input_method.gyp:gencode',
(...skipping 768 matching lines...) Expand 10 before | Expand all | Expand 10 after
4851 ['include', '^browser/ui/views/reload_button.cc'], 4843 ['include', '^browser/ui/views/reload_button.cc'],
4852 ['include', '^browser/ui/views/reload_button.h'], 4844 ['include', '^browser/ui/views/reload_button.h'],
4853 ['include', '^browser/ui/views/restart_message_box.cc'], 4845 ['include', '^browser/ui/views/restart_message_box.cc'],
4854 ['include', '^browser/ui/views/restart_message_box.h'], 4846 ['include', '^browser/ui/views/restart_message_box.h'],
4855 ['include', '^browser/ui/views/sad_tab_view.cc'], 4847 ['include', '^browser/ui/views/sad_tab_view.cc'],
4856 ['include', '^browser/ui/views/sad_tab_view.h'], 4848 ['include', '^browser/ui/views/sad_tab_view.h'],
4857 ['include', '^browser/ui/views/simple_message_box_views.cc'], 4849 ['include', '^browser/ui/views/simple_message_box_views.cc'],
4858 ['include', '^browser/ui/views/simple_message_box_views.h'], 4850 ['include', '^browser/ui/views/simple_message_box_views.h'],
4859 ['include', '^browser/ui/views/status_bubble_views.cc'], 4851 ['include', '^browser/ui/views/status_bubble_views.cc'],
4860 ['include', '^browser/ui/views/status_bubble_views.h'], 4852 ['include', '^browser/ui/views/status_bubble_views.h'],
4861 ['include', '^browser/ui/views/status_icons/status_icon_chromeos .cc'], 4853 ['include', '^browser/ui/views/status_icons/status_tray_linux.cc '],
4862 ['include', '^browser/ui/views/status_icons/status_icon_chromeos .h'],
4863 ['include', '^browser/ui/views/status_icons/status_tray_chromeos .cc'],
4864 ['include', '^browser/ui/views/status_icons/status_tray_chromeos .h'],
4865 ['include', '^browser/ui/views/tab_contents/native_tab_contents_ container_aura.cc'], 4854 ['include', '^browser/ui/views/tab_contents/native_tab_contents_ container_aura.cc'],
4866 ['include', '^browser/ui/views/tab_contents/native_tab_contents_ container_aura.h'], 4855 ['include', '^browser/ui/views/tab_contents/native_tab_contents_ container_aura.h'],
4867 ['include', '^browser/ui/views/tab_contents/native_tab_contents_ container_gtk.cc'], 4856 ['include', '^browser/ui/views/tab_contents/native_tab_contents_ container_gtk.cc'],
4868 ['include', '^browser/ui/views/tab_contents/native_tab_contents_ container_gtk.h'], 4857 ['include', '^browser/ui/views/tab_contents/native_tab_contents_ container_gtk.h'],
4869 ['include', '^browser/ui/views/tab_contents/native_tab_contents_ container_views.cc'], 4858 ['include', '^browser/ui/views/tab_contents/native_tab_contents_ container_views.cc'],
4870 ['include', '^browser/ui/views/tab_contents/native_tab_contents_ container_views.h'], 4859 ['include', '^browser/ui/views/tab_contents/native_tab_contents_ container_views.h'],
4871 ['include', '^browser/ui/views/tab_contents/native_tab_contents_ view_aura.cc'], 4860 ['include', '^browser/ui/views/tab_contents/native_tab_contents_ view_aura.cc'],
4872 ['include', '^browser/ui/views/tab_contents/native_tab_contents_ view_aura.h'], 4861 ['include', '^browser/ui/views/tab_contents/native_tab_contents_ view_aura.h'],
4873 ['include', '^browser/ui/views/tab_contents/native_tab_contents_ view_gtk.cc'], 4862 ['include', '^browser/ui/views/tab_contents/native_tab_contents_ view_gtk.cc'],
4874 ['include', '^browser/ui/views/tab_contents/native_tab_contents_ view_gtk.h'], 4863 ['include', '^browser/ui/views/tab_contents/native_tab_contents_ view_gtk.h'],
(...skipping 288 matching lines...) Expand 10 before | Expand all | Expand 10 after
5163 ['include', '^browser/ui/views/constrained_window_views.cc'], 5152 ['include', '^browser/ui/views/constrained_window_views.cc'],
5164 ['include', '^browser/ui/views/dropdown_bar_host_aura.cc'], 5153 ['include', '^browser/ui/views/dropdown_bar_host_aura.cc'],
5165 ['include', '^browser/ui/views/find_bar_host_aura.cc'], 5154 ['include', '^browser/ui/views/find_bar_host_aura.cc'],
5166 ['include', '^browser/ui/views/first_run_bubble.cc'], 5155 ['include', '^browser/ui/views/first_run_bubble.cc'],
5167 ['include', '^browser/ui/views/frame/browser_frame_aura.cc'], 5156 ['include', '^browser/ui/views/frame/browser_frame_aura.cc'],
5168 ['include', '^browser/ui/views/frame/browser_non_client_frame_view_a ura.cc'], 5157 ['include', '^browser/ui/views/frame/browser_non_client_frame_view_a ura.cc'],
5169 ['include', '^browser/ui/views/frame/browser_non_client_frame_view_a ura.h'], 5158 ['include', '^browser/ui/views/frame/browser_non_client_frame_view_a ura.h'],
5170 ['include', '^browser/ui/views/frame/browser_non_client_frame_view_f actory_aura.cc'], 5159 ['include', '^browser/ui/views/frame/browser_non_client_frame_view_f actory_aura.cc'],
5171 ['include', '^browser/ui/views/importer/import_lock_dialog_view.cc'] , 5160 ['include', '^browser/ui/views/importer/import_lock_dialog_view.cc'] ,
5172 ['include', '^browser/ui/views/native_constrained_window_aura.cc'], 5161 ['include', '^browser/ui/views/native_constrained_window_aura.cc'],
5173 ['include', '^browser/ui/views/status_icons/status_tray_linux.cc'],
5174 ['include', '^browser/ui/views/stubs_aura.cc'], 5162 ['include', '^browser/ui/views/stubs_aura.cc'],
5175 ], 5163 ],
5176 }], 5164 }],
5177 # Build Aura with ChromeOS. 5165 # Build Aura with ChromeOS.
5178 ['use_aura==1 and chromeos==1', { 5166 ['use_aura==1 and chromeos==1', {
5179 'sources/': [ 5167 'sources/': [
5180 ['exclude', '^browser/chromeos/browser/chromeos/login/screen_locker. cc'], 5168 ['exclude', '^browser/chromeos/browser/chromeos/login/screen_locker. cc'],
5181 ['exclude', '^browser/chromeos/frame/'], 5169 ['exclude', '^browser/chromeos/frame/'],
5182 ['exclude', '^browser/chromeos/legacy_window_manager/wm_ipc.cc'], 5170 ['exclude', '^browser/chromeos/legacy_window_manager/wm_ipc.cc'],
5183 ['exclude', '^browser/chromeos/legacy_window_manager/wm_message_list ener.cc'], 5171 ['exclude', '^browser/chromeos/legacy_window_manager/wm_message_list ener.cc'],
5184 ['exclude', '^browser/chromeos/login/background_view.cc'], 5172 ['exclude', '^browser/chromeos/login/background_view.cc'],
5185 ['exclude', '^browser/chromeos/login/screen_locker_browsertest.cc'], 5173 ['exclude', '^browser/chromeos/login/screen_locker_browsertest.cc'],
5186 ['exclude', '^browser/chromeos/login/screen_locker_views.cc'], 5174 ['exclude', '^browser/chromeos/login/screen_locker_views.cc'],
5187 ['exclude', '^browser/chromeos/login/screen_locker.cc'], 5175 ['exclude', '^browser/chromeos/login/screen_locker.cc'],
5188 ['exclude', '^browser/chromeos/login/screen_lock_view.cc'], 5176 ['exclude', '^browser/chromeos/login/screen_lock_view.cc'],
5189 ['exclude', '^browser/chromeos/login/shutdown_button.cc'], 5177 ['exclude', '^browser/chromeos/login/shutdown_button.cc'],
5190 ['exclude', '^browser/chromeos/login/username_view.cc'], 5178 ['exclude', '^browser/chromeos/login/username_view.cc'],
5191 ['exclude', '^browser/chromeos/login/user_view.cc'], 5179 ['exclude', '^browser/chromeos/login/user_view.cc'],
5192 ['exclude', '^browser/chromeos/login/views_login_display.cc'], 5180 ['exclude', '^browser/chromeos/login/views_login_display.cc'],
5193 ['exclude', '^browser/chromeos/login/views_login_display_host.cc'], 5181 ['exclude', '^browser/chromeos/login/views_login_display_host.cc'],
5194 ['exclude', '^browser/chromeos/login/webui_screen_locker.cc'], 5182 ['exclude', '^browser/chromeos/login/webui_screen_locker.cc'],
5195 ['exclude', '^browser/chromeos/login/wizard_in_process_browser_test. cc'], 5183 ['exclude', '^browser/chromeos/login/wizard_in_process_browser_test. cc'],
5196 ['exclude', '^browser/chromeos/notifications/'], 5184 ['exclude', '^browser/chromeos/notifications/'],
5197 ['exclude', '^browser/chromeos/xinput_hierarchy_changed_event_listen er.cc'], 5185 ['exclude', '^browser/chromeos/xinput_hierarchy_changed_event_listen er.cc'],
5198 ['include', '^browser/ui/views/handle_web_keyboard_event_aura.cc'], 5186 ['include', '^browser/ui/views/handle_web_keyboard_event_aura.cc'],
5199 ['include', '^browser/ui/views/handle_web_keyboard_event.h'], 5187 ['include', '^browser/ui/views/handle_web_keyboard_event.h'],
5200 ['exclude', '^browser/ui/views/status_icons/status_icon_chromeos.cc' ],
5201 ['exclude', '^browser/ui/views/status_icons/status_icon_chromeos.h'] ,
5202 ['exclude', '^browser/ui/views/status_icons/status_tray_chromeos.cc' ],
5203 ['exclude', '^browser/ui/views/status_icons/status_tray_chromeos.h'] ,
5204 ['include', '^browser/ui/views/status_icons/status_tray_linux.cc'],
5205 ], 5188 ],
5206 }], 5189 }],
5207 [ 'use_openssl==1', { 5190 [ 'use_openssl==1', {
5208 'sources!': [ 5191 'sources!': [
5209 'browser/importer/nss_decryptor.cc', 5192 'browser/importer/nss_decryptor.cc',
5210 'browser/importer/nss_decryptor_system_nss.cc', 5193 'browser/importer/nss_decryptor_system_nss.cc',
5211 'browser/importer/nss_decryptor_system_nss.h', 5194 'browser/importer/nss_decryptor_system_nss.h',
5212 'browser/ui/crypto_module_password_dialog_nss.cc', 5195 'browser/ui/crypto_module_password_dialog_nss.cc',
5213 ]}, { 5196 ]}, {
5214 'sources!': [ 5197 'sources!': [
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
5299 'type': 'static_library', 5282 'type': 'static_library',
5300 'sources': [ 'browser/history/in_memory_url_index_cache.proto' ], 5283 'sources': [ 'browser/history/in_memory_url_index_cache.proto' ],
5301 'variables': { 5284 'variables': {
5302 'proto_in_dir': 'browser/history', 5285 'proto_in_dir': 'browser/history',
5303 'proto_out_dir': 'chrome/browser/history', 5286 'proto_out_dir': 'chrome/browser/history',
5304 }, 5287 },
5305 'includes': [ '../build/protoc.gypi' ] 5288 'includes': [ '../build/protoc.gypi' ]
5306 }, 5289 },
5307 ], 5290 ],
5308 } 5291 }
OLDNEW
« 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