bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium version 94.0.4606.0 (#911515)

Browse Source
This commit is contained in:
Marshall Greenblatt
2021-08-19 19:40:49 -04:00
parent 955097ea77
commit 25c1947f1d
85 changed files with 745 additions and 726 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
patch/patches/chrome_browser_background_mode_1100085.patch
View File

@@ -1,61 +1,3 @@
diff --git chrome/browser/app_controller_mac.mm chrome/browser/app_controller_mac.mm
index dd4c916b7581a..c27d72bf53c9b 100644
--- chrome/browser/app_controller_mac.mm
+++ chrome/browser/app_controller_mac.mm
@@ -31,6 +31,7 @@
#include "base/threading/scoped_blocking_call.h"
#include "base/threading/thread_restrictions.h"
#include "build/branding_buildflags.h"
+#include "cef/libcef/features/features.h"
#include "chrome/app/chrome_command_ids.h"
#include "chrome/browser/apps/app_shim/app_shim_manager_mac.h"
#include "chrome/browser/apps/app_shim/app_shim_termination_manager.h"
@@ -1339,6 +1340,7 @@ static base::mac::ScopedObjCClassSwizzler* g_swizzle_imk_input_session;
// Run a (background) application in a new tab.
- (void)executeApplication:(id)sender {
+#if BUILDFLAG(ENABLE_BACKGROUND_MODE)
NSInteger tag = [sender tag];
Profile* profile = [self lastProfile];
DCHECK(profile);
@@ -1347,6 +1349,7 @@ static base::mac::ScopedObjCClassSwizzler* g_swizzle_imk_input_session;
tag < static_cast<int>(applications.size()));
const extensions::Extension* extension = applications.GetExtension(tag);
BackgroundModeManager::LaunchBackgroundApplication(profile, extension);
+#endif // BUILDFLAG(ENABLE_BACKGROUND_MODE)
}
// Same as |-commandDispatch:|, but executes commands using a disposition
@@ -1702,6 +1705,7 @@ static base::mac::ScopedObjCClassSwizzler* g_swizzle_imk_input_session;
[dockMenu addItem:item];
}
+#if BUILDFLAG(ENABLE_BACKGROUND_MODE)
// TODO(rickcam): Mock out BackgroundApplicationListModel, then add unit tests
// which use the mock in place of the profile-initialized model.
BackgroundApplicationListModel applications(profile);
@@ -1726,6 +1730,7 @@ static base::mac::ScopedObjCClassSwizzler* g_swizzle_imk_input_session;
[appMenu addItem:appItem];
}
}
+#endif // BUILDFLAG(ENABLE_BACKGROUND_MODE)
return dockMenu;
}
@@ -1963,11 +1968,13 @@ static base::mac::ScopedObjCClassSwizzler* g_swizzle_imk_input_session;
namespace {
void UpdateProfileInUse(Profile* profile, Profile::CreateStatus status) {
+#if !BUILDFLAG(ENABLE_CEF)
if (status == Profile::CREATE_STATUS_INITIALIZED) {
AppController* controller =
base::mac::ObjCCastStrict<AppController>([NSApp delegate]);
[controller windowChangedToProfile:profile];
}
+#endif // !BUILDFLAG(ENABLE_CEF)
}
void OpenUrlsInBrowserWithProfile(const std::vector<GURL>& urls,
diff --git chrome/browser/browser_process.h chrome/browser/browser_process.h
index a7657cb6e5d5e..d6c6f3225fcb6 100644
--- chrome/browser/browser_process.h
@@ -72,10 +14,10 @@ index a7657cb6e5d5e..d6c6f3225fcb6 100644
std::unique_ptr<BackgroundModeManager> manager) = 0;
#endif
diff --git chrome/browser/browser_process_impl.cc chrome/browser/browser_process_impl.cc
index 1149818336011..0e454299e2622 100644
index 18620c247548a..bbe2db2355d1e 100644
--- chrome/browser/browser_process_impl.cc
+++ chrome/browser/browser_process_impl.cc
@@ -970,18 +970,14 @@ DownloadRequestLimiter* BrowserProcessImpl::download_request_limiter() {
@@ -981,18 +981,14 @@ DownloadRequestLimiter* BrowserProcessImpl::download_request_limiter() {
return download_request_limiter_.get();
}