diff options
| -rw-r--r-- | chrome/chrome_browser.gypi | 2 | ||||
| -rw-r--r-- | chrome/installer/installer_tools.gyp | 26 | ||||
| -rw-r--r-- | chrome_elf/BUILD.gn | 1 | ||||
| -rw-r--r-- | chrome_elf/chrome_elf.gyp | 1 | ||||
| -rw-r--r-- | components/policy/policy_common.gypi | 1 | ||||
| -rw-r--r-- | mojo/mojo_edk.gyp | 1 | ||||
| -rw-r--r-- | third_party/WebKit/public/blink_headers.gypi | 51 |
7 files changed, 24 insertions, 59 deletions
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index 40fe802..9466e45 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -301,7 +301,7 @@ 'browser/background_sync/background_sync_controller_factory.cc', 'browser/background_sync/background_sync_controller_factory.h', 'browser/background_sync/background_sync_controller_impl.cc', - 'browser/background_sync/background_sync_controller_implh.h', + 'browser/background_sync/background_sync_controller_impl.h', 'browser/bad_message.cc', 'browser/bad_message.h', 'browser/banners/app_banner_data_fetcher.cc', diff --git a/chrome/installer/installer_tools.gyp b/chrome/installer/installer_tools.gyp index c926caf..e30bce4 100644 --- a/chrome/installer/installer_tools.gyp +++ b/chrome/installer/installer_tools.gyp @@ -3,36 +3,10 @@ # found in the LICENSE file. { - 'variables': { - 'version_py': '<(DEPTH)/build/util/version.py', - 'version_path': '<(DEPTH)/chrome/VERSION', - 'lastchange_path': '<(DEPTH)/build/util/LASTCHANGE', - 'branding_dir': '<(DEPTH)/chrome/app/theme/<(branding_path_component)', - 'msvs_use_common_release': 0, - 'msvs_use_common_linker_extras': 0, - }, 'conditions': [ ['OS=="win"', { 'targets': [ { - 'target_name': 'validate_installation', - 'type': 'executable', - 'dependencies': [ - '<(DEPTH)/base/base.gyp:base', - '<(DEPTH)/chrome/chrome.gyp:installer_util', - '<(DEPTH)/chrome/chrome.gyp:installer_util_strings', - '<(DEPTH)/chrome/common_constants.gyp:common_constants', - ], - 'include_dirs': [ - '<(DEPTH)', - ], - 'sources': [ - 'tools/validate_installation.rc', - 'tools/validate_installation_main.cc', - 'tools/validate_installation_resource.h', - ], - }, - { # A target that is outdated if any of the mini_installer test sources # are modified. 'target_name': 'test_installer_sentinel', diff --git a/chrome_elf/BUILD.gn b/chrome_elf/BUILD.gn index 50eca48..4f9c747 100644 --- a/chrome_elf/BUILD.gn +++ b/chrome_elf/BUILD.gn @@ -58,7 +58,6 @@ source_set("common") { ":constants", ] sources = [ - "chrome_elf_types.h", "chrome_elf_util.cc", "chrome_elf_util.h", "thunk_getter.cc", diff --git a/chrome_elf/chrome_elf.gyp b/chrome_elf/chrome_elf.gyp index 1532c17..26fc27c 100644 --- a/chrome_elf/chrome_elf.gyp +++ b/chrome_elf/chrome_elf.gyp @@ -122,7 +122,6 @@ '..', ], 'sources': [ - 'chrome_elf_types.h', 'chrome_elf_util.cc', 'chrome_elf_util.h', 'thunk_getter.cc', diff --git a/components/policy/policy_common.gypi b/components/policy/policy_common.gypi index 5e876ac..55573e6 100644 --- a/components/policy/policy_common.gypi +++ b/components/policy/policy_common.gypi @@ -141,7 +141,6 @@ 'core/common/schema_registry_tracking_policy_provider.cc', 'core/common/schema_registry_tracking_policy_provider.h', 'policy_export.h', - 'policy/policy_risk_tag.h' ], 'conditions': [ ['OS=="android"', { diff --git a/mojo/mojo_edk.gyp b/mojo/mojo_edk.gyp index 79bd3c4..531def5 100644 --- a/mojo/mojo_edk.gyp +++ b/mojo/mojo_edk.gyp @@ -36,7 +36,6 @@ ], 'sources': [ 'edk/embedder/configuration.h', - 'edk/embedder/channel_info_forward.h', 'edk/embedder/embedder.cc', 'edk/embedder/embedder.h', 'edk/embedder/embedder_internal.h', diff --git a/third_party/WebKit/public/blink_headers.gypi b/third_party/WebKit/public/blink_headers.gypi index a7aea36a..bfa3b93 100644 --- a/third_party/WebKit/public/blink_headers.gypi +++ b/third_party/WebKit/public/blink_headers.gypi @@ -27,7 +27,6 @@ "platform/WebColor.h", "platform/WebCommon.h", "platform/WebCompositeAndReadbackAsyncCallback.h", - "platform/WebCompositedDisplayList.h", "platform/WebCompositorAnimation.h", "platform/WebCompositorAnimationCurve.h", "platform/WebCompositorAnimationDelegate.h", @@ -63,9 +62,7 @@ "platform/WebDatabaseObserver.h", "platform/WebDeviceLightListener.h", "platform/WebDiscardableMemory.h", - "platform/WebDisplayItemClipTree.h", "platform/WebDisplayItemList.h", - "platform/WebDisplayItemTransformTree.h", "platform/WebDisplayMode.h", "platform/WebDoublePoint.h", "platform/WebDragData.h", @@ -99,7 +96,6 @@ "platform/WebFloatRect.h", "platform/WebFloatSize.h", "platform/WebFocusType.h", - "platform/WebFrameHostScheduler.h", "platform/WebFrameScheduler.h", "platform/WebFrameTimingEvent.h", "platform/WebGamepad.h", @@ -199,26 +195,6 @@ "platform/WebScrollbarThemePainter.h", "platform/WebSecurityOrigin.h", "platform/WebSelectionBound.h", - "platform/WebServiceWorker.h", - "platform/WebServiceWorkerCache.h", - "platform/WebServiceWorkerCacheError.h", - "platform/WebServiceWorkerCacheStorage.h", - "platform/WebServiceWorkerClientQueryOptions.h", - "platform/WebServiceWorkerClientType.h", - "platform/WebServiceWorkerClientsClaimCallbacks.h", - "platform/WebServiceWorkerClientsInfo.h", - "platform/WebServiceWorkerError.h", - "platform/WebServiceWorkerEventResult.h", - "platform/WebServiceWorkerProvider.h", - "platform/WebServiceWorkerProviderClient.h", - "platform/WebServiceWorkerProxy.h", - "platform/WebServiceWorkerRegistration.h", - "platform/WebServiceWorkerRegistrationProxy.h", - "platform/WebServiceWorkerRequest.h", - "platform/WebServiceWorkerResponse.h", - "platform/WebServiceWorkerResponseType.h", - "platform/WebServiceWorkerSkipWaitingCallbacks.h", - "platform/WebServiceWorkerState.h", "platform/WebSetSinkIdCallbacks.h", "platform/WebSize.h", "platform/WebSocketHandle.h", @@ -315,7 +291,6 @@ "platform/modules/presentation/WebPresentationClient.h", "platform/modules/presentation/WebPresentationController.h", "platform/modules/presentation/WebPresentationError.h", - "platform/modules/presentation/WebPresentationSessionClient.h", "platform/modules/push_messaging/WebPushClient.h", "platform/modules/push_messaging/WebPushError.h", "platform/modules/push_messaging/WebPushPermissionStatus.h", @@ -327,6 +302,26 @@ "platform/modules/screen_orientation/WebScreenOrientationClient.h", "platform/modules/screen_orientation/WebScreenOrientationLockType.h", "platform/modules/screen_orientation/WebScreenOrientationType.h", + "platform/modules/serviceworker/WebServiceWorker.h", + "platform/modules/serviceworker/WebServiceWorkerCache.h", + "platform/modules/serviceworker/WebServiceWorkerCacheError.h", + "platform/modules/serviceworker/WebServiceWorkerCacheStorage.h", + "platform/modules/serviceworker/WebServiceWorkerClientQueryOptions.h", + "platform/modules/serviceworker/WebServiceWorkerClientType.h", + "platform/modules/serviceworker/WebServiceWorkerClientsClaimCallbacks.h", + "platform/modules/serviceworker/WebServiceWorkerClientsInfo.h", + "platform/modules/serviceworker/WebServiceWorkerError.h", + "platform/modules/serviceworker/WebServiceWorkerEventResult.h", + "platform/modules/serviceworker/WebServiceWorkerProvider.h", + "platform/modules/serviceworker/WebServiceWorkerProviderClient.h", + "platform/modules/serviceworker/WebServiceWorkerProxy.h", + "platform/modules/serviceworker/WebServiceWorkerRegistration.h", + "platform/modules/serviceworker/WebServiceWorkerRegistrationProxy.h", + "platform/modules/serviceworker/WebServiceWorkerRequest.h", + "platform/modules/serviceworker/WebServiceWorkerResponse.h", + "platform/modules/serviceworker/WebServiceWorkerResponseType.h", + "platform/modules/serviceworker/WebServiceWorkerSkipWaitingCallbacks.h", + "platform/modules/serviceworker/WebServiceWorkerState.h", "platform/modules/vr/WebVR.h", "platform/modules/vr/WebVRClient.h", "platform/modules/webusb/WebUSBClient.h", @@ -471,9 +466,6 @@ "web/WebSelector.h", "web/WebSerializedScriptValue.h", "web/WebSerializedScriptValueVersion.h", - "web/WebServiceWorkerContextClient.h", - "web/WebServiceWorkerContextProxy.h", - "web/WebServiceWorkerNetworkProvider.h", "web/WebSettings.h", "web/WebSharedWorker.h", "web/WebSharedWorkerClient.h", @@ -521,6 +513,9 @@ "web/mac/WebScrollbarTheme.h", "web/mac/WebSubstringUtil.h", "web/modules/notifications/WebNotificationPermissionCallback.h", + "web/modules/serviceworker/WebServiceWorkerContextClient.h", + "web/modules/serviceworker/WebServiceWorkerContextProxy.h", + "web/modules/serviceworker/WebServiceWorkerNetworkProvider.h", "web/win/WebFontRendering.h", ], }, |