e012801420
* Update to Chromium 68.0.3440.128 and Node 10.10.0
* update v8, ffmpeg, chromium, crashpad, boringssl, and webrtc patches
* fix SSL_get_tlsext_status_type patch
* pass encryption_modes_supported to CdmInfo
* kNoSandbox moved into service_manager
* bump CHROME_VERSION_STRING
TODO: automatically pull in the real chrome version
* PathService -> base::PathService
* net::X509Certificate::Equals -> net::X509Certificate::EqualsExcludingChain
* use content::ChildProcessTerminationInfo
* GetHandle() -> GetProcess().Handle()
* ScopedNestableTaskAllower doesn't take an argument
* net::HttpAuthCache::ClearEntriesAddedWithin -> ClearAllEntries
* std::unique_ptr<WebContents>
* blink::WebFullscreenOptions
* OnAudioStateChanged doesn't take a WebContents
* content::RESULT_CODE_NORMAL_EXIT -> service_manager::RESULT_CODE_NORMAL_EXIT
* MessageLoopCurrent
* WasResized -> SynchronizeVisualProperties
* SetTimeStamp takes a base::TimeTicks
* ExecuteScriptInIsolatedWorld is single-script only
* DispatchNonPersistentCloseEvent takes a callback now
* expose URLRequestContextGetter::{Add,Remove}Observer
* test: remove no longer existing Chromium test deps
cc_blink_unittests has been removed in
https://chromium-review.googlesource.com/1053765
mojo_common_unittests has been removed in
https://chromium-review.googlesource.com/1028000
* SetFdLimit -> IncreaseFdLimitTo
NOTE: the behaviour of this API has changed slightly, and we should
mention that in the notes.
* MessageLoop::QuitWhenIdleClosure -> RunLoop::QuitCurrentWhenIdleClosureDeprecated
* certificate_transparency moved out of net/
pending a clearer decision about what to do with CT
in the mean time, copy CreateLogVerifiersForKnownLogs from deleted chromium source
* add secure_origin_whitelist to chrome source list
NOTE: is this something we actually want? cc @deepak1556
* DrainBackgroundTasks -> DrainTasks
* use new node options parser
* fix disable_scroll_begin_dcheck.patch
* ViewsDelegate::CreateWebContents went away
see 1031314
* kZygoteProcess moved into service_manager
* test: minor improvements to the Node spec
- reformat some parts
- better failures reporting with `expect`
- skip some tests instead of marking them as passed
* chromium removed *_posix.cc from the source filters
* test: fix :electron_tests compilation
* better crash diagnostics in ffmpeg test
* fix: enable back a DCHECK in viz::ServerSharedBitmapManager
Fixes #14327.
Backports https://chromium-review.googlesource.com/802574.
* chore: update linux sysroots
* chore: remove obsolete "install-sysroot.py" script
* test: fix frame-subscriber test on Mac
* disable OSR for now
* test: make before-input-event test more robust
* test: make run-as-node --inspect test more robust on windows
* roll node to v10.11.0
* avoid duplicate files when building a zip
* disable failing assert in beginFrameSubscription dirty-rectangle test
* experiment with is_cfi = false
* fix: build torque with x64 toolchain
Co-Authored-By: Alexey Kuzmin <github@alexeykuzmin.com>
* test: disable the "app.relaunch" test on Linux
* chore: bump node to get header tar file
* chore: bump node to fix tar.py line endings
56 lines
1.9 KiB
Diff
56 lines
1.9 KiB
Diff
diff --git a/chrome/browser/apps/app_shim/BUILD.gn b/chrome/browser/apps/app_shim/BUILD.gn
|
|
index b480129fcd7c..4f4f7d06029b 100644
|
|
--- a/chrome/browser/apps/app_shim/BUILD.gn
|
|
+++ b/chrome/browser/apps/app_shim/BUILD.gn
|
|
@@ -1,6 +1,7 @@
|
|
# Copyright 2015 The Chromium Authors. All rights reserved.
|
|
# Use of this source code is governed by a BSD-style license that can be
|
|
# found in the LICENSE file.
|
|
+import("//extensions/buildflags/buildflags.gni")
|
|
|
|
# This is the part of the Chrome browser process responsible for launching and
|
|
# communicating with app_shim processes on Mac.
|
|
@@ -14,8 +15,6 @@ source_set("app_shim") {
|
|
"app_shim_host_manager_mac.mm",
|
|
"apps_page_shim_handler.h",
|
|
"apps_page_shim_handler.mm",
|
|
- "extension_app_shim_handler_mac.cc",
|
|
- "extension_app_shim_handler_mac.h",
|
|
"unix_domain_socket_acceptor.cc",
|
|
"unix_domain_socket_acceptor.h",
|
|
]
|
|
@@ -23,7 +22,16 @@ source_set("app_shim") {
|
|
deps = [
|
|
"//content/public/browser",
|
|
"//content/public/common",
|
|
- "//extensions/browser",
|
|
- "//extensions/common",
|
|
]
|
|
+
|
|
+ if (enable_extensions) {
|
|
+ sources += [
|
|
+ "extension_app_shim_handler_mac.cc",
|
|
+ "extension_app_shim_handler_mac.h",
|
|
+ ]
|
|
+ deps += [
|
|
+ "//extensions/browser",
|
|
+ "//extensions/common",
|
|
+ ]
|
|
+ }
|
|
}
|
|
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
|
|
index c514878fafe7..bcd3432f75c9 100644
|
|
--- a/chrome/browser/ui/BUILD.gn
|
|
+++ b/chrome/browser/ui/BUILD.gn
|
|
@@ -2495,7 +2495,10 @@ split_static_library("ui") {
|
|
"views/tabs/window_finder_mac.mm",
|
|
]
|
|
|
|
- deps += [ "//extensions/components/native_app_window" ]
|
|
+
|
|
+ if (enable_extensions) {
|
|
+ deps += [ "//extensions/components/native_app_window" ]
|
|
+ }
|
|
|
|
# Truly cocoa-browser-specific sources. These are secondary UI pieces that
|
|
# are obsolete before mac_views_browser will ever ship, so they aren't
|