mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 92.0.4515.0 (#885287)
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
diff --git chrome/browser/app_controller_mac.mm chrome/browser/app_controller_mac.mm
|
||||
index 3f0c080690084..52d0d8eb43c3e 100644
|
||||
index c7780ede01c83..6b856949d3c0a 100644
|
||||
--- chrome/browser/app_controller_mac.mm
|
||||
+++ chrome/browser/app_controller_mac.mm
|
||||
@@ -31,6 +31,7 @@
|
||||
@@ -10,7 +10,7 @@ index 3f0c080690084..52d0d8eb43c3e 100644
|
||||
#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"
|
||||
@@ -1211,6 +1212,7 @@ static base::mac::ScopedObjCClassSwizzler* g_swizzle_imk_input_session;
|
||||
@@ -1290,6 +1291,7 @@ static base::mac::ScopedObjCClassSwizzler* g_swizzle_imk_input_session;
|
||||
|
||||
// Run a (background) application in a new tab.
|
||||
- (void)executeApplication:(id)sender {
|
||||
@@ -18,7 +18,7 @@ index 3f0c080690084..52d0d8eb43c3e 100644
|
||||
NSInteger tag = [sender tag];
|
||||
Profile* profile = [self lastProfile];
|
||||
DCHECK(profile);
|
||||
@@ -1219,6 +1221,7 @@ static base::mac::ScopedObjCClassSwizzler* g_swizzle_imk_input_session;
|
||||
@@ -1298,6 +1300,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);
|
||||
@@ -26,7 +26,7 @@ index 3f0c080690084..52d0d8eb43c3e 100644
|
||||
}
|
||||
|
||||
// Same as |-commandDispatch:|, but executes commands using a disposition
|
||||
@@ -1606,6 +1609,7 @@ static base::mac::ScopedObjCClassSwizzler* g_swizzle_imk_input_session;
|
||||
@@ -1693,6 +1696,7 @@ static base::mac::ScopedObjCClassSwizzler* g_swizzle_imk_input_session;
|
||||
// TODO(rickcam): Mock out BackgroundApplicationListModel, then add unit
|
||||
// tests which use the mock in place of the profile-initialized model.
|
||||
|
||||
@@ -34,7 +34,7 @@ index 3f0c080690084..52d0d8eb43c3e 100644
|
||||
// Avoid breaking unit tests which have no profile.
|
||||
if (profile) {
|
||||
BackgroundApplicationListModel applications(profile);
|
||||
@@ -1632,6 +1636,7 @@ static base::mac::ScopedObjCClassSwizzler* g_swizzle_imk_input_session;
|
||||
@@ -1719,6 +1723,7 @@ static base::mac::ScopedObjCClassSwizzler* g_swizzle_imk_input_session;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -42,7 +42,7 @@ index 3f0c080690084..52d0d8eb43c3e 100644
|
||||
|
||||
return dockMenu;
|
||||
}
|
||||
@@ -1861,11 +1866,13 @@ static base::mac::ScopedObjCClassSwizzler* g_swizzle_imk_input_session;
|
||||
@@ -1948,11 +1953,13 @@ static base::mac::ScopedObjCClassSwizzler* g_swizzle_imk_input_session;
|
||||
namespace {
|
||||
|
||||
void UpdateProfileInUse(Profile* profile, Profile::CreateStatus status) {
|
||||
@@ -72,10 +72,10 @@ index 3d634db18900a..96e44ad48e5e5 100644
|
||||
std::unique_ptr<BackgroundModeManager> manager) = 0;
|
||||
#endif
|
||||
diff --git chrome/browser/browser_process_impl.cc chrome/browser/browser_process_impl.cc
|
||||
index 89a682d5c9352..946ccbda587c7 100644
|
||||
index cce917cdc65db..5da3a16aef1c7 100644
|
||||
--- chrome/browser/browser_process_impl.cc
|
||||
+++ chrome/browser/browser_process_impl.cc
|
||||
@@ -947,18 +947,14 @@ DownloadRequestLimiter* BrowserProcessImpl::download_request_limiter() {
|
||||
@@ -952,18 +952,14 @@ DownloadRequestLimiter* BrowserProcessImpl::download_request_limiter() {
|
||||
return download_request_limiter_.get();
|
||||
}
|
||||
|
||||
@@ -128,46 +128,3 @@ index e0cafee5eedd6..06ded156be3cc 100644
|
||||
|
||||
// Make a copy of the BrowserList to simplify the case where we need to
|
||||
// destroy a Browser during the loop.
|
||||
diff --git chrome/browser/sessions/app_session_service.cc chrome/browser/sessions/app_session_service.cc
|
||||
index 071884fe257bb..47160e3e47bdb 100644
|
||||
--- chrome/browser/sessions/app_session_service.cc
|
||||
+++ chrome/browser/sessions/app_session_service.cc
|
||||
@@ -90,8 +90,11 @@ void AppSessionService::MaybeDeleteSessionOnlyData() {
|
||||
// Clear session data if the last window for a profile has been closed and
|
||||
// closing the last window would normally close Chrome, unless background mode
|
||||
// is active. Tests don't have a background_mode_manager.
|
||||
- if (browser_defaults::kBrowserAliveWithNoWindows ||
|
||||
- g_browser_process->background_mode_manager()->IsBackgroundModeActive()) {
|
||||
+ if (browser_defaults::kBrowserAliveWithNoWindows
|
||||
+#if BUILDFLAG(ENABLE_BACKGROUND_MODE)
|
||||
+ || g_browser_process->background_mode_manager()->IsBackgroundModeActive()
|
||||
+#endif
|
||||
+ ) {
|
||||
return;
|
||||
}
|
||||
|
||||
diff --git chrome/browser/sessions/session_service.cc chrome/browser/sessions/session_service.cc
|
||||
index e5074800fbb00..e6c59d05ee204 100644
|
||||
--- chrome/browser/sessions/session_service.cc
|
||||
+++ chrome/browser/sessions/session_service.cc
|
||||
@@ -553,12 +553,19 @@ void SessionService::MaybeDeleteSessionOnlyData() {
|
||||
if (profile()->AsTestingProfile())
|
||||
return;
|
||||
|
||||
+#if BUILDFLAG(ENABLE_BACKGROUND_MODE)
|
||||
+ const bool background_mode_active =
|
||||
+ g_browser_process->background_mode_manager()->IsBackgroundModeActive();
|
||||
+#else
|
||||
+ const bool background_mode_active = false;
|
||||
+#endif
|
||||
+
|
||||
// Clear session data if the last window for a profile has been closed and
|
||||
// closing the last window would normally close Chrome, unless background mode
|
||||
// is active. Tests don't have a background_mode_manager.
|
||||
if (has_open_trackable_browsers_ ||
|
||||
browser_defaults::kBrowserAliveWithNoWindows ||
|
||||
- g_browser_process->background_mode_manager()->IsBackgroundModeActive()) {
|
||||
+ background_mode_active) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user