mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 99.0.4844.83
This commit is contained in:
committed by
Marshall Greenblatt
parent
2977b3a12c
commit
d9af8665d0
@@ -7,6 +7,6 @@
|
|||||||
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
|
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
|
||||||
|
|
||||||
{
|
{
|
||||||
'chromium_checkout': 'refs/tags/99.0.4844.74',
|
'chromium_checkout': 'refs/tags/99.0.4844.83',
|
||||||
'depot_tools_checkout': '289dedd36b'
|
'depot_tools_checkout': '289dedd36b'
|
||||||
}
|
}
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
diff --git chrome/browser/BUILD.gn chrome/browser/BUILD.gn
|
diff --git chrome/browser/BUILD.gn chrome/browser/BUILD.gn
|
||||||
index 4e7f448dda7d0..f87c49b796bd9 100644
|
index 5d956361e7bae..81e2df3f04e51 100644
|
||||||
--- chrome/browser/BUILD.gn
|
--- chrome/browser/BUILD.gn
|
||||||
+++ chrome/browser/BUILD.gn
|
+++ chrome/browser/BUILD.gn
|
||||||
@@ -12,6 +12,7 @@ import("//build/config/features.gni")
|
@@ -12,6 +12,7 @@ import("//build/config/features.gni")
|
||||||
|
@@ -132,7 +132,7 @@ index 4e9969d9c5b0b..e599b114f021d 100644
|
|||||||
GetMainRunLoopInstance()->QuitWhenIdleClosure());
|
GetMainRunLoopInstance()->QuitWhenIdleClosure());
|
||||||
}
|
}
|
||||||
diff --git chrome/browser/chrome_browser_main_mac.mm chrome/browser/chrome_browser_main_mac.mm
|
diff --git chrome/browser/chrome_browser_main_mac.mm chrome/browser/chrome_browser_main_mac.mm
|
||||||
index 831d7173873d1..594aee58331a7 100644
|
index 8bf722c61c059..ac755279227f2 100644
|
||||||
--- chrome/browser/chrome_browser_main_mac.mm
|
--- chrome/browser/chrome_browser_main_mac.mm
|
||||||
+++ chrome/browser/chrome_browser_main_mac.mm
|
+++ chrome/browser/chrome_browser_main_mac.mm
|
||||||
@@ -16,6 +16,7 @@
|
@@ -16,6 +16,7 @@
|
||||||
@@ -143,7 +143,7 @@ index 831d7173873d1..594aee58331a7 100644
|
|||||||
#import "chrome/browser/app_controller_mac.h"
|
#import "chrome/browser/app_controller_mac.h"
|
||||||
#include "chrome/browser/apps/app_shim/app_shim_listener.h"
|
#include "chrome/browser/apps/app_shim/app_shim_listener.h"
|
||||||
#include "chrome/browser/browser_process.h"
|
#include "chrome/browser/browser_process.h"
|
||||||
@@ -111,6 +112,7 @@ void ChromeBrowserMainPartsMac::PreCreateMainMessageLoop() {
|
@@ -112,6 +113,7 @@ void ChromeBrowserMainPartsMac::PreCreateMainMessageLoop() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -151,15 +151,15 @@ index 831d7173873d1..594aee58331a7 100644
|
|||||||
// Create the app delegate. This object is intentionally leaked as a global
|
// Create the app delegate. This object is intentionally leaked as a global
|
||||||
// singleton. It is accessed through -[NSApp delegate].
|
// singleton. It is accessed through -[NSApp delegate].
|
||||||
AppController* app_controller = [[AppController alloc] init];
|
AppController* app_controller = [[AppController alloc] init];
|
||||||
@@ -119,6 +121,7 @@ void ChromeBrowserMainPartsMac::PreCreateMainMessageLoop() {
|
@@ -120,6 +122,7 @@ void ChromeBrowserMainPartsMac::PreCreateMainMessageLoop() {
|
||||||
chrome::BuildMainMenu(NSApp, app_controller,
|
chrome::BuildMainMenu(NSApp, app_controller,
|
||||||
l10n_util::GetStringUTF16(IDS_PRODUCT_NAME), false);
|
l10n_util::GetStringUTF16(IDS_PRODUCT_NAME), false);
|
||||||
[app_controller mainMenuCreated];
|
[app_controller mainMenuCreated];
|
||||||
+#endif // BUILDFLAG(ENABLE_CEF)
|
+#endif // BUILDFLAG(ENABLE_CEF)
|
||||||
|
|
||||||
chrome::DeveloperIDCertificateReauthorizeInApp();
|
chrome::DeveloperIDCertificateReauthorizeInApp();
|
||||||
|
chrome::PurgeStaleScreenCapturePermission();
|
||||||
@@ -180,7 +183,9 @@ void ChromeBrowserMainPartsMac::PostProfileInit(Profile* profile,
|
@@ -182,7 +185,9 @@ void ChromeBrowserMainPartsMac::PostProfileInit(Profile* profile,
|
||||||
}
|
}
|
||||||
|
|
||||||
void ChromeBrowserMainPartsMac::DidEndMainMessageLoop() {
|
void ChromeBrowserMainPartsMac::DidEndMainMessageLoop() {
|
||||||
|
Reference in New Issue
Block a user