mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 102.0.5005.0 (#992738)
Linux: 32-bit x86 builds are no longer supported (see issue #2676).
This commit is contained in:
@@ -85,7 +85,7 @@ index ca2561e412621..febd52df6c971 100644
|
||||
virtual bool IsSignedIn() = 0;
|
||||
|
||||
diff --git chrome/browser/profiles/profile_impl.cc chrome/browser/profiles/profile_impl.cc
|
||||
index a3d0830cebbca..3af475c216e63 100644
|
||||
index bf169b652ef30..b2bb98ceada7f 100644
|
||||
--- chrome/browser/profiles/profile_impl.cc
|
||||
+++ chrome/browser/profiles/profile_impl.cc
|
||||
@@ -993,7 +993,9 @@ Profile* ProfileImpl::GetOffTheRecordProfile(const OTRProfileID& otr_profile_id,
|
||||
@@ -100,7 +100,7 @@ index a3d0830cebbca..3af475c216e63 100644
|
||||
return raw_otr_profile;
|
||||
}
|
||||
diff --git chrome/browser/profiles/profile_manager.cc chrome/browser/profiles/profile_manager.cc
|
||||
index 026d2c91a4923..1a49c3c42e7ca 100644
|
||||
index 45389cca9b0ab..ab1573eaaf7a7 100644
|
||||
--- chrome/browser/profiles/profile_manager.cc
|
||||
+++ chrome/browser/profiles/profile_manager.cc
|
||||
@@ -512,7 +512,7 @@ ProfileManager::ProfileManager(const base::FilePath& user_data_dir)
|
||||
@@ -113,7 +113,7 @@ index 026d2c91a4923..1a49c3c42e7ca 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 cc3c0dfb5be1b..89a35c2f914c4 100644
|
||||
index 8ba4e0ba9f3c0..d7b888f7120c4 100644
|
||||
--- chrome/browser/profiles/profile_manager.h
|
||||
+++ chrome/browser/profiles/profile_manager.h
|
||||
@@ -151,7 +151,7 @@ class ProfileManager : public Profile::Delegate {
|
||||
@@ -135,7 +135,7 @@ index cc3c0dfb5be1b..89a35c2f914c4 100644
|
||||
// Returns the directory where the first created profile is stored,
|
||||
// relative to the user data directory currently in use.
|
||||
diff --git chrome/browser/profiles/renderer_updater.cc chrome/browser/profiles/renderer_updater.cc
|
||||
index 290b0e3e352ea..6fa4420236c13 100644
|
||||
index 6ccdfa7f3cc46..f8668efcc77f6 100644
|
||||
--- chrome/browser/profiles/renderer_updater.cc
|
||||
+++ chrome/browser/profiles/renderer_updater.cc
|
||||
@@ -8,6 +8,7 @@
|
||||
@@ -146,7 +146,7 @@ index 290b0e3e352ea..6fa4420236c13 100644
|
||||
#include "chrome/browser/content_settings/content_settings_manager_delegate.h"
|
||||
#include "chrome/browser/content_settings/host_content_settings_map_factory.h"
|
||||
#include "chrome/browser/profiles/profile.h"
|
||||
@@ -85,8 +86,10 @@ RendererUpdater::RendererUpdater(Profile* profile)
|
||||
@@ -35,8 +36,10 @@ RendererUpdater::RendererUpdater(Profile* profile)
|
||||
: profile_(profile),
|
||||
is_off_the_record_(profile_->IsOffTheRecord()),
|
||||
original_profile_(profile->GetOriginalProfile()) {
|
||||
|
Reference in New Issue
Block a user