diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-03-08 10:28:10 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-03-20 13:40:30 +0000 |
commit | e733310db58160074f574c429d48f8308c0afe17 (patch) | |
tree | f8aef4b7e62a69928dbcf880620eece20f98c6df /chromium/chromeos | |
parent | 2f583e4aec1ae3a86fa047829c96b310dc12ecdf (diff) | |
download | qtwebengine-chromium-e733310db58160074f574c429d48f8308c0afe17.tar.gz |
BASELINE: Update Chromium to 56.0.2924.122
Change-Id: I4e04de8f47e47e501c46ed934c76a431c6337ced
Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/chromeos')
-rw-r--r-- | chromium/chromeos/BUILD.gn | 2 | ||||
-rw-r--r-- | chromium/chromeos/chromeos.gyp | 32 |
2 files changed, 31 insertions, 3 deletions
diff --git a/chromium/chromeos/BUILD.gn b/chromium/chromeos/BUILD.gn index 95dd7f08c0b..6a416a8b5bb 100644 --- a/chromium/chromeos/BUILD.gn +++ b/chromium/chromeos/BUILD.gn @@ -33,6 +33,7 @@ component("chromeos") { "//components/device_event_log", "//components/onc", "//components/policy/proto", + "//components/pref_registry", "//components/prefs", "//components/proxy_config", "//components/signin/core/account_id", @@ -41,6 +42,7 @@ component("chromeos") { "//crypto:platform", "//google_apis", "//net", + "//skia", # For components/user_manager "//third_party/icu", "//third_party/libxml", "//third_party/protobuf:protobuf_lite", diff --git a/chromium/chromeos/chromeos.gyp b/chromium/chromeos/chromeos.gyp index f5d865f31ae..4f72786cd63 100644 --- a/chromium/chromeos/chromeos.gyp +++ b/chromium/chromeos/chromeos.gyp @@ -85,6 +85,8 @@ 'dbus/arc_obb_mounter_client.h', 'dbus/audio_node.cc', 'dbus/audio_node.h', + 'dbus/auth_policy_client.cc', + 'dbus/auth_policy_client.h', 'dbus/blocking_method_caller.cc', 'dbus/blocking_method_caller.h', 'dbus/cras_audio_client.cc', @@ -108,6 +110,8 @@ 'dbus/easy_unlock_client.h', 'dbus/fake_arc_obb_mounter_client.cc', 'dbus/fake_arc_obb_mounter_client.h', + 'dbus/fake_auth_policy_client.cc', + 'dbus/fake_auth_policy_client.h', 'dbus/fake_cras_audio_client.cc', 'dbus/fake_cras_audio_client.h', 'dbus/fake_cros_disks_client.cc', @@ -122,6 +126,8 @@ 'dbus/fake_gsm_sms_client.h', 'dbus/fake_image_burner_client.cc', 'dbus/fake_image_burner_client.h', + 'dbus/fake_image_loader_client.cc', + 'dbus/fake_image_loader_client.h', 'dbus/fake_lorgnette_manager_client.cc', 'dbus/fake_lorgnette_manager_client.h', 'dbus/fake_modem_messaging_client.cc', @@ -146,10 +152,14 @@ 'dbus/fake_sms_client.h', 'dbus/fake_system_clock_client.cc', 'dbus/fake_system_clock_client.h', + 'dbus/fake_upstart_client.cc', + 'dbus/fake_upstart_client.h', 'dbus/gsm_sms_client.cc', 'dbus/gsm_sms_client.h', 'dbus/image_burner_client.cc', 'dbus/image_burner_client.h', + 'dbus/image_loader_client.cc', + 'dbus/image_loader_client.h', 'dbus/lorgnette_manager_client.cc', 'dbus/lorgnette_manager_client.h', 'dbus/modem_messaging_client.cc', @@ -194,6 +204,8 @@ 'dbus/system_clock_client.h', 'dbus/update_engine_client.cc', 'dbus/update_engine_client.h', + 'dbus/upstart_client.cc', + 'dbus/upstart_client.h', 'dbus/volume_state.cc', 'dbus/volume_state.h', 'disks/disk_mount_manager.cc', @@ -236,8 +248,6 @@ 'login/auth/user_context.h', 'login/login_state.cc', 'login/login_state.h', - 'login/user_names.cc', - 'login/user_names.h', 'login_event_recorder.cc', 'login_event_recorder.h', 'network/auto_connect_handler.cc', @@ -275,6 +285,8 @@ 'network/network_configuration_handler.cc', 'network/network_configuration_handler.h', 'network/network_configuration_observer.h', + 'network/network_connect.cc', + 'network/network_connect.h', 'network/network_connection_handler.cc', 'network/network_connection_handler.h', 'network/network_connection_observer.cc', @@ -341,12 +353,24 @@ 'network/portal_detector/network_portal_detector_stub.h', 'network/prohibited_technologies_handler.cc', 'network/prohibited_technologies_handler.h', + 'network/proxy/proxy_config_handler.cc', + 'network/proxy/proxy_config_handler.h', + 'network/proxy/proxy_config_service_impl.cc', + 'network/proxy/proxy_config_service_impl.h', + 'network/proxy/ui_proxy_config.cc', + 'network/proxy/ui_proxy_config.h', + 'network/proxy/ui_proxy_config_service.cc', + 'network/proxy/ui_proxy_config_service.h', 'network/shill_property_handler.cc', 'network/shill_property_handler.h', 'network/shill_property_util.cc', 'network/shill_property_util.h', 'printing/fake_printer_discoverer.cc', 'printing/fake_printer_discoverer.h', + 'printing/ppd_cache.cc', + 'printing/ppd_cache.h', + 'printing/ppd_provider.cc', + 'printing/ppd_provider.h', 'printing/printer_configuration.cc', 'printing/printer_configuration.h', 'printing/printer_discoverer.h', @@ -462,6 +486,8 @@ 'network/onc/onc_validator_unittest.cc', 'network/prohibited_technologies_handler_unittest.cc', 'network/shill_property_handler_unittest.cc', + 'printing/ppd_cache_unittest.cc', + 'printing/ppd_provider_unittest.cc', 'printing/printer_translator_unittest.cc', 'process_proxy/process_output_watcher_unittest.cc', 'process_proxy/process_proxy_unittest.cc', @@ -525,7 +551,7 @@ 'type': 'static_library', 'dependencies': [ '../build/linux/system.gyp:dbus', - '../google_apis/google_apis.gyp:google_apis_test_support', + '../google_apis/google_apis.gyp:google_apis_test_support', '../testing/gmock.gyp:gmock', 'chromeos', 'chromeos_test_support_without_gmock', |