mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 120.0.6099.0 (#1217362)
- chrome: Disable upgrade/downgrade behavior (see #3608) - chrome: Disable process singleton behavior (see #3609) - chrome: Disable config as default system browser (see #3613)
This commit is contained in:
@@ -1,8 +1,8 @@
|
||||
diff --git chrome/browser/profiles/off_the_record_profile_impl.cc chrome/browser/profiles/off_the_record_profile_impl.cc
|
||||
index 48e30b2833a05..2d848247b9bce 100644
|
||||
index 9bba6cea235e0..9dc5b40559207 100644
|
||||
--- chrome/browser/profiles/off_the_record_profile_impl.cc
|
||||
+++ chrome/browser/profiles/off_the_record_profile_impl.cc
|
||||
@@ -652,7 +652,9 @@ std::unique_ptr<Profile> Profile::CreateOffTheRecordProfile(
|
||||
@@ -650,7 +650,9 @@ std::unique_ptr<Profile> Profile::CreateOffTheRecordProfile(
|
||||
#endif
|
||||
if (!profile)
|
||||
profile = std::make_unique<OffTheRecordProfileImpl>(parent, otr_profile_id);
|
||||
@@ -14,7 +14,7 @@ index 48e30b2833a05..2d848247b9bce 100644
|
||||
}
|
||||
|
||||
diff --git chrome/browser/profiles/profile.cc chrome/browser/profiles/profile.cc
|
||||
index 6cffe941b26f9..3e6223ab0d423 100644
|
||||
index 7c7c87ce27103..f4bc0400d9268 100644
|
||||
--- chrome/browser/profiles/profile.cc
|
||||
+++ chrome/browser/profiles/profile.cc
|
||||
@@ -84,6 +84,7 @@ base::LazyInstance<std::set<content::BrowserContext*>>::Leaky
|
||||
@@ -52,7 +52,7 @@ index 6cffe941b26f9..3e6223ab0d423 100644
|
||||
Profile::OTRProfileID Profile::OTRProfileID::CreateUniqueForDevTools() {
|
||||
return CreateUnique(kDevToolsOTRProfileIDPrefix);
|
||||
diff --git chrome/browser/profiles/profile.h chrome/browser/profiles/profile.h
|
||||
index ee1675aa1ecc9..cb526d1aba30d 100644
|
||||
index 52eb459e9deba..11a92e9e5cfdc 100644
|
||||
--- chrome/browser/profiles/profile.h
|
||||
+++ chrome/browser/profiles/profile.h
|
||||
@@ -104,6 +104,10 @@ class Profile : public content::BrowserContext {
|
||||
@@ -66,7 +66,7 @@ index ee1675aa1ecc9..cb526d1aba30d 100644
|
||||
// Creates a unique OTR profile id to be used for DevTools browser contexts.
|
||||
static OTRProfileID CreateUniqueForDevTools();
|
||||
|
||||
@@ -528,6 +532,8 @@ class Profile : public content::BrowserContext {
|
||||
@@ -521,6 +525,8 @@ class Profile : public content::BrowserContext {
|
||||
return instant_service_;
|
||||
}
|
||||
|
||||
@@ -75,7 +75,7 @@ index ee1675aa1ecc9..cb526d1aba30d 100644
|
||||
protected:
|
||||
// Creates an OffTheRecordProfile which points to this Profile.
|
||||
static std::unique_ptr<Profile> CreateOffTheRecordProfile(
|
||||
@@ -539,7 +545,6 @@ class Profile : public content::BrowserContext {
|
||||
@@ -532,7 +538,6 @@ class Profile : public content::BrowserContext {
|
||||
static PrefStore* CreateExtensionPrefStore(Profile*,
|
||||
bool incognito_pref_store);
|
||||
|
||||
@@ -84,10 +84,10 @@ index ee1675aa1ecc9..cb526d1aba30d 100644
|
||||
|
||||
// Returns whether the user has signed in this profile to an account.
|
||||
diff --git chrome/browser/profiles/profile_impl.cc chrome/browser/profiles/profile_impl.cc
|
||||
index 90859a99248a4..26fec83939559 100644
|
||||
index d397943b6fc9f..4b381fd2e27f4 100644
|
||||
--- chrome/browser/profiles/profile_impl.cc
|
||||
+++ chrome/browser/profiles/profile_impl.cc
|
||||
@@ -1023,7 +1023,9 @@ Profile* ProfileImpl::GetOffTheRecordProfile(const OTRProfileID& otr_profile_id,
|
||||
@@ -1031,7 +1031,9 @@ Profile* ProfileImpl::GetOffTheRecordProfile(const OTRProfileID& otr_profile_id,
|
||||
|
||||
otr_profiles_[otr_profile_id] = std::move(otr_profile);
|
||||
|
||||
@@ -99,10 +99,10 @@ index 90859a99248a4..26fec83939559 100644
|
||||
return raw_otr_profile;
|
||||
}
|
||||
diff --git chrome/browser/profiles/profile_manager.cc chrome/browser/profiles/profile_manager.cc
|
||||
index d403a5b78dfbf..85620c16dbf6e 100644
|
||||
index ae86705656ce2..3fa9ad761af3b 100644
|
||||
--- chrome/browser/profiles/profile_manager.cc
|
||||
+++ chrome/browser/profiles/profile_manager.cc
|
||||
@@ -435,7 +435,7 @@ ProfileManager::ProfileManager(const base::FilePath& user_data_dir)
|
||||
@@ -434,7 +434,7 @@ ProfileManager::ProfileManager(const base::FilePath& user_data_dir)
|
||||
profile_manager_android_ = std::make_unique<ProfileManagerAndroid>(this);
|
||||
#endif
|
||||
|
||||
@@ -112,7 +112,7 @@ index d403a5b78dfbf..85620c16dbf6e 100644
|
||||
|
||||
zombie_metrics_timer_.Start(FROM_HERE, base::Minutes(30), this,
|
||||
diff --git chrome/browser/profiles/profile_manager.h chrome/browser/profiles/profile_manager.h
|
||||
index 5f471502c07a8..6a28e9452a359 100644
|
||||
index f1530f47eebf0..a41dcf65d9f11 100644
|
||||
--- chrome/browser/profiles/profile_manager.h
|
||||
+++ chrome/browser/profiles/profile_manager.h
|
||||
@@ -134,7 +134,7 @@ class ProfileManager : public Profile::Delegate {
|
||||
@@ -124,7 +124,7 @@ index 5f471502c07a8..6a28e9452a359 100644
|
||||
|
||||
// Returns regular or off-the-record profile given its profile key.
|
||||
static Profile* GetProfileFromProfileKey(ProfileKey* profile_key);
|
||||
@@ -178,7 +178,7 @@ class ProfileManager : public Profile::Delegate {
|
||||
@@ -175,7 +175,7 @@ class ProfileManager : public Profile::Delegate {
|
||||
|
||||
// Returns true if the profile pointer is known to point to an existing
|
||||
// profile.
|
||||
|
Reference in New Issue
Block a user