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

Side by Side Diff: chrome/chrome_browser.gypi

Issue 8476003: Implement the status tray/icon API for ChromeOS. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixing gyp problems in the bots that led to reverting. 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',
3540 'browser/ui/views/status_icons/status_icon_win.cc', 3542 'browser/ui/views/status_icons/status_icon_win.cc',
3541 'browser/ui/views/status_icons/status_icon_win.h', 3543 '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',
3542 'browser/ui/views/status_icons/status_tray_linux.cc', 3546 'browser/ui/views/status_icons/status_tray_linux.cc',
3543 'browser/ui/views/status_icons/status_tray_win.cc', 3547 'browser/ui/views/status_icons/status_tray_win.cc',
3544 'browser/ui/views/status_icons/status_tray_win.h', 3548 'browser/ui/views/status_icons/status_tray_win.h',
3545 'browser/ui/views/stubs_aura.cc', 3549 'browser/ui/views/stubs_aura.cc',
3546 'browser/ui/views/tab_contents/native_tab_contents_container.h', 3550 'browser/ui/views/tab_contents/native_tab_contents_container.h',
3547 'browser/ui/views/tab_contents/native_tab_contents_container_aura.cc', 3551 'browser/ui/views/tab_contents/native_tab_contents_container_aura.cc',
3548 'browser/ui/views/tab_contents/native_tab_contents_container_aura.h', 3552 'browser/ui/views/tab_contents/native_tab_contents_container_aura.h',
3549 'browser/ui/views/tab_contents/native_tab_contents_container_gtk.cc', 3553 'browser/ui/views/tab_contents/native_tab_contents_container_gtk.cc',
3550 'browser/ui/views/tab_contents/native_tab_contents_container_gtk.h', 3554 'browser/ui/views/tab_contents/native_tab_contents_container_gtk.h',
3551 'browser/ui/views/tab_contents/native_tab_contents_container_views.cc', 3555 'browser/ui/views/tab_contents/native_tab_contents_container_views.cc',
(...skipping 503 matching lines...) Expand 10 before | Expand all | Expand 10 after
4055 ['exclude', 'browser/policy/device_policy_cache.h'], 4059 ['exclude', 'browser/policy/device_policy_cache.h'],
4056 ['exclude', 'browser/policy/enterprise_install_attributes.cc'], 4060 ['exclude', 'browser/policy/enterprise_install_attributes.cc'],
4057 ['exclude', 'browser/policy/enterprise_install_attributes.h'], 4061 ['exclude', 'browser/policy/enterprise_install_attributes.h'],
4058 ['exclude', 'browser/policy/network_configuration_updater.cc'], 4062 ['exclude', 'browser/policy/network_configuration_updater.cc'],
4059 ['exclude', 'browser/policy/network_configuration_updater.h'], 4063 ['exclude', 'browser/policy/network_configuration_updater.h'],
4060 ['exclude', 'browser/policy/proto/chrome_device_policy.pb.cc'], 4064 ['exclude', 'browser/policy/proto/chrome_device_policy.pb.cc'],
4061 ['exclude', 'browser/policy/proto/chrome_device_policy.pb.h'], 4065 ['exclude', 'browser/policy/proto/chrome_device_policy.pb.h'],
4062 ['exclude', 'browser/renderer_host/offline_resource_handler.cc'], 4066 ['exclude', 'browser/renderer_host/offline_resource_handler.cc'],
4063 ['exclude', 'browser/renderer_host/offline_resource_handler.h'], 4067 ['exclude', 'browser/renderer_host/offline_resource_handler.h'],
4064 ['exclude', 'browser/ui/toolbar/wrench_menu_model_chromeos.cc'], 4068 ['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'],
4065 ['exclude', 'browser/ui/webui/active_downloads_ui.cc'], 4073 ['exclude', 'browser/ui/webui/active_downloads_ui.cc'],
4066 ['exclude', 'browser/ui/webui/fileicon_source_chromeos.cc'], 4074 ['exclude', 'browser/ui/webui/fileicon_source_chromeos.cc'],
4067 ['exclude', 'browser/ui/webui/fileicon_source_chromeos.h'], 4075 ['exclude', 'browser/ui/webui/fileicon_source_chromeos.h'],
4068 ], 4076 ],
4069 }], 4077 }],
4070 ['chromeos==1', { 4078 ['chromeos==1', {
4071 'dependencies': [ 4079 'dependencies': [
4072 '../build/linux/system.gyp:dbus-glib', 4080 '../build/linux/system.gyp:dbus-glib',
4073 '../third_party/libevent/libevent.gyp:libevent', 4081 '../third_party/libevent/libevent.gyp:libevent',
4074 'browser/chromeos/input_method/input_method.gyp:gencode', 4082 'browser/chromeos/input_method/input_method.gyp:gencode',
(...skipping 910 matching lines...) Expand 10 before | Expand all | Expand 10 after
4985 ], 4993 ],
4986 }], 4994 }],
4987 # Exclude extension_input_ui_api that depends on chromeos again 4995 # Exclude extension_input_ui_api that depends on chromeos again
4988 # (Required because of the '^browser/extensions/' include above) 4996 # (Required because of the '^browser/extensions/' include above)
4989 ['chromeos == 0', { 4997 ['chromeos == 0', {
4990 'sources/': [ 4998 'sources/': [
4991 ['exclude', '^browser/extensions/extension_input_ui_api.cc'], 4999 ['exclude', '^browser/extensions/extension_input_ui_api.cc'],
4992 ['exclude', '^browser/extensions/extension_input_ui_api.h'], 5000 ['exclude', '^browser/extensions/extension_input_ui_api.h'],
4993 ], 5001 ],
4994 }], 5002 }],
5003 # Include the chromeos status tray/icon only for non-aura builds.
5004 ['OS=="linux" and toolkit_views==1 and chromeos==1 and use_aura==0', {
5005 'sources/': [
5006 ['include', '^browser/ui/views/status_icons/status_icon_chromeos .cc'],
5007 ['include', '^browser/ui/views/status_icons/status_icon_chromeos .h'],
5008 ['include', '^browser/ui/views/status_icons/status_tray_chromeos .cc'],
5009 ['include', '^browser/ui/views/status_icons/status_tray_chromeos .h'],
5010 ['exclude', '^browser/ui/views/status_icons/status_tray_linux.cc '],
5011 ],
5012 }],
4995 # Exclude file manager files again 5013 # Exclude file manager files again
4996 # (Required because of the '^browser/extensions/' include above) 5014 # (Required because of the '^browser/extensions/' include above)
4997 ['file_manager_extension==0', { 5015 ['file_manager_extension==0', {
4998 'sources/': [ 5016 'sources/': [
4999 ['exclude', 'browser/extensions/extension_file_browser_private_a pi.cc'], 5017 ['exclude', 'browser/extensions/extension_file_browser_private_a pi.cc'],
5000 ['exclude', 'browser/extensions/extension_file_browser_private_a pi.h'], 5018 ['exclude', 'browser/extensions/extension_file_browser_private_a pi.h'],
5001 ['exclude', 'browser/extensions/extension_mediaplayer_private_ap i.cc'], 5019 ['exclude', 'browser/extensions/extension_mediaplayer_private_ap i.cc'],
5002 ['exclude', 'browser/extensions/extension_mediaplayer_private_ap i.h'], 5020 ['exclude', 'browser/extensions/extension_mediaplayer_private_ap i.h'],
5003 ['exclude', 'browser/extensions/file_manager_util.h'], 5021 ['exclude', 'browser/extensions/file_manager_util.h'],
5004 ['exclude', 'browser/extensions/file_manager_util.cc'], 5022 ['exclude', 'browser/extensions/file_manager_util.cc'],
(...skipping 277 matching lines...) Expand 10 before | Expand all | Expand 10 after
5282 'type': 'static_library', 5300 'type': 'static_library',
5283 'sources': [ 'browser/history/in_memory_url_index_cache.proto' ], 5301 'sources': [ 'browser/history/in_memory_url_index_cache.proto' ],
5284 'variables': { 5302 'variables': {
5285 'proto_in_dir': 'browser/history', 5303 'proto_in_dir': 'browser/history',
5286 'proto_out_dir': 'chrome/browser/history', 5304 'proto_out_dir': 'chrome/browser/history',
5287 }, 5305 },
5288 'includes': [ '../build/protoc.gypi' ] 5306 'includes': [ '../build/protoc.gypi' ]
5289 }, 5307 },
5290 ], 5308 ],
5291 } 5309 }
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