diff options
author | hashimoto@chromium.org <hashimoto@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-06 01:54:36 +0000 |
---|---|---|
committer | hashimoto@chromium.org <hashimoto@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-06 01:54:36 +0000 |
commit | 64e199254481d6132c3a7ccdf9b3a743bff86a88 (patch) | |
tree | c10cdf03cbde8439d1d8a7070a6c7f9fdf10f517 /chrome/chrome_browser.gypi | |
parent | 81a476c9ce1088345db02cf1647399d0e673d487 (diff) | |
download | chromium_src-64e199254481d6132c3a7ccdf9b3a743bff86a88.zip chromium_src-64e199254481d6132c3a7ccdf9b3a743bff86a88.tar.gz chromium_src-64e199254481d6132c3a7ccdf9b3a743bff86a88.tar.bz2 |
Move files inside chrome/browser/chromeos/dbus to chromeos/dbus
Move files in chrome/browser/chromeos/dbus/ to chromeos/dbus
Add chromeos/dbus/DEPS
Add chromeos.gyp:chromeos_test_support and chromeos.gyp:chromeos_unittests
Add CHROMEOS_EXPORT to classes
Move power related proto targets to chromeos.gyp
Rewrite and sort #includes
BUG=119583
TEST=component chromeos build success, checkdeps success
Review URL: https://chromiumcodereview.appspot.com/9838085
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@131065 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_browser.gypi')
-rw-r--r-- | chrome/chrome_browser.gypi | 85 |
1 files changed, 0 insertions, 85 deletions
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index cc07d28..a260ba1 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -470,59 +470,12 @@ 'browser/chromeos/cryptohome/async_method_caller.h', 'browser/chromeos/customization_document.cc', 'browser/chromeos/customization_document.h', - 'browser/chromeos/dbus/blocking_method_caller.cc', - 'browser/chromeos/dbus/blocking_method_caller.h', - 'browser/chromeos/dbus/bluetooth_adapter_client.cc', - 'browser/chromeos/dbus/bluetooth_adapter_client.h', - 'browser/chromeos/dbus/bluetooth_agent_service_provider.cc', - 'browser/chromeos/dbus/bluetooth_agent_service_provider.h', - 'browser/chromeos/dbus/bluetooth_device_client.cc', - 'browser/chromeos/dbus/bluetooth_device_client.h', - 'browser/chromeos/dbus/bluetooth_input_client.cc', - 'browser/chromeos/dbus/bluetooth_input_client.h', - 'browser/chromeos/dbus/bluetooth_manager_client.cc', - 'browser/chromeos/dbus/bluetooth_manager_client.h', - 'browser/chromeos/dbus/bluetooth_node_client.cc', - 'browser/chromeos/dbus/bluetooth_node_client.h', - 'browser/chromeos/dbus/bluetooth_property.cc', - 'browser/chromeos/dbus/bluetooth_property.h', - 'browser/chromeos/dbus/cashew_client.cc', - 'browser/chromeos/dbus/cashew_client.h', - 'browser/chromeos/dbus/cros_disks_client.cc', - 'browser/chromeos/dbus/cros_disks_client.h', - 'browser/chromeos/dbus/cryptohome_client.cc', - 'browser/chromeos/dbus/cryptohome_client.h', 'browser/chromeos/dbus/cros_dbus_service.cc', 'browser/chromeos/dbus/cros_dbus_service.h', - 'browser/chromeos/dbus/dbus_client_implementation_type.h', - 'browser/chromeos/dbus/dbus_thread_manager.cc', - 'browser/chromeos/dbus/dbus_thread_manager.h', - 'browser/chromeos/dbus/debug_daemon_client.cc', - 'browser/chromeos/dbus/debug_daemon_client.h', - 'browser/chromeos/dbus/flimflam_ipconfig_client.cc', - 'browser/chromeos/dbus/flimflam_ipconfig_client.h', - 'browser/chromeos/dbus/flimflam_client_helper.cc', - 'browser/chromeos/dbus/flimflam_client_helper.h', - 'browser/chromeos/dbus/flimflam_network_client.cc', - 'browser/chromeos/dbus/flimflam_network_client.h', - 'browser/chromeos/dbus/flimflam_profile_client.cc', - 'browser/chromeos/dbus/flimflam_profile_client.h', - 'browser/chromeos/dbus/image_burner_client.cc', - 'browser/chromeos/dbus/image_burner_client.h', - 'browser/chromeos/dbus/introspectable_client.cc', - 'browser/chromeos/dbus/introspectable_client.h', 'browser/chromeos/dbus/introspect_util.cc', 'browser/chromeos/dbus/introspect_util.h', - 'browser/chromeos/dbus/power_manager_client.cc', - 'browser/chromeos/dbus/power_manager_client.h', 'browser/chromeos/dbus/proxy_resolution_service_provider.cc', 'browser/chromeos/dbus/proxy_resolution_service_provider.h', - 'browser/chromeos/dbus/session_manager_client.cc', - 'browser/chromeos/dbus/session_manager_client.h', - 'browser/chromeos/dbus/speech_synthesizer_client.cc', - 'browser/chromeos/dbus/speech_synthesizer_client.h', - 'browser/chromeos/dbus/update_engine_client.cc', - 'browser/chromeos/dbus/update_engine_client.h', 'browser/chromeos/disks/disk_mount_manager.cc', 'browser/chromeos/disks/disk_mount_manager.h', 'browser/chromeos/enrollment_dialog_view.cc', @@ -4224,8 +4177,6 @@ '../third_party/libevent/libevent.gyp:libevent', '../third_party/mozc/chrome/chromeos/renderer/chromeos_renderer.gyp:mozc_candidates_proto', 'browser/chromeos/input_method/input_method.gyp:gencode', - 'power_supply_properties_proto', - 'power_state_control_proto', ], 'sources!': [ 'browser/first_run/upgrade_util.cc', @@ -5284,41 +5235,5 @@ }, 'includes': [ '../build/protoc.gypi' ] }, - { - # Protobuf compiler / generator for the PowerSupplyProperties protocol - # buffer. - 'target_name': 'power_supply_properties_proto', - 'type': 'static_library', - 'conditions': [ - ['chromeos==1', { - 'sources': [ - '../third_party/cros_system_api/dbus/power_supply_properties.proto', - ], - 'variables': { - 'proto_in_dir': '../third_party/cros_system_api/dbus/', - 'proto_out_dir': 'chrome/browser/chromeos/dbus', - }, - 'includes': ['../build/protoc.gypi'], - }], - ], - }, - { - # Protobuf compiler / generator for the PowerSupplyProperties protocol - # buffer. - 'target_name': 'power_state_control_proto', - 'type': 'static_library', - 'conditions': [ - ['chromeos==1', { - 'sources': [ - '../third_party/cros_system_api/dbus/power_state_control.proto', - ], - 'variables': { - 'proto_in_dir': '../third_party/cros_system_api/dbus/', - 'proto_out_dir': 'chrome/browser/chromeos/dbus', - }, - 'includes': ['../build/protoc.gypi'], - }], - ], - }, ], } |