2021-04-09 20:34:45 +02:00
|
|
|
diff --git chrome/browser/profiles/off_the_record_profile_impl.cc chrome/browser/profiles/off_the_record_profile_impl.cc
|
2022-02-21 23:23:40 +01:00
|
|
|
index 5e634ca7e08b1..3cfd301688e33 100644
|
2021-04-09 20:34:45 +02:00
|
|
|
--- chrome/browser/profiles/off_the_record_profile_impl.cc
|
|
|
|
+++ chrome/browser/profiles/off_the_record_profile_impl.cc
|
2022-02-21 23:23:40 +01:00
|
|
|
@@ -629,7 +629,9 @@ std::unique_ptr<Profile> Profile::CreateOffTheRecordProfile(
|
2021-04-09 20:34:45 +02:00
|
|
|
#endif
|
|
|
|
if (!profile)
|
2021-04-21 00:52:34 +02:00
|
|
|
profile = std::make_unique<OffTheRecordProfileImpl>(parent, otr_profile_id);
|
2021-04-09 20:34:45 +02:00
|
|
|
- profile->Init();
|
|
|
|
+ // With CEF we want to delay initialization.
|
|
|
|
+ if (!otr_profile_id.IsUniqueForCEF())
|
|
|
|
+ profile->Init();
|
|
|
|
return std::move(profile);
|
|
|
|
}
|
|
|
|
|
2021-04-07 00:09:45 +02:00
|
|
|
diff --git chrome/browser/profiles/profile.cc chrome/browser/profiles/profile.cc
|
2022-02-21 23:23:40 +01:00
|
|
|
index 779971a744754..c35a4eba3f2d9 100644
|
2021-04-07 00:09:45 +02:00
|
|
|
--- chrome/browser/profiles/profile.cc
|
|
|
|
+++ chrome/browser/profiles/profile.cc
|
2022-02-21 23:23:40 +01:00
|
|
|
@@ -82,6 +82,7 @@ base::LazyInstance<std::set<content::BrowserContext*>>::Leaky
|
2021-04-07 00:09:45 +02:00
|
|
|
|
|
|
|
namespace {
|
|
|
|
|
|
|
|
+const char kCEFOTRProfileIDPrefix[] = "CEF::BrowserContext";
|
|
|
|
const char kDevToolsOTRProfileIDPrefix[] = "Devtools::BrowserContext";
|
|
|
|
const char kMediaRouterOTRProfileIDPrefix[] = "MediaRouter::Presentation";
|
2021-06-04 03:34:56 +02:00
|
|
|
const char kTestOTRProfileIDPrefix[] = "Test::OTR";
|
2022-02-21 23:23:40 +01:00
|
|
|
@@ -96,6 +97,8 @@ bool Profile::OTRProfileID::AllowsBrowserWindows() const {
|
2021-04-07 00:09:45 +02:00
|
|
|
// DevTools::BrowserContext and MediaRouter::Presentation are an
|
|
|
|
// exception to this ban.
|
|
|
|
return *this == PrimaryID() ||
|
|
|
|
+ base::StartsWith(profile_id_, kCEFOTRProfileIDPrefix,
|
|
|
|
+ base::CompareCase::SENSITIVE) ||
|
|
|
|
base::StartsWith(profile_id_, kDevToolsOTRProfileIDPrefix,
|
|
|
|
base::CompareCase::SENSITIVE) ||
|
|
|
|
base::StartsWith(profile_id_, kMediaRouterOTRProfileIDPrefix,
|
2022-02-21 23:23:40 +01:00
|
|
|
@@ -117,6 +120,16 @@ Profile::OTRProfileID Profile::OTRProfileID::CreateUnique(
|
2021-04-21 00:52:34 +02:00
|
|
|
base::GUID::GenerateRandomV4().AsLowercaseString().c_str()));
|
2021-04-07 00:09:45 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
+// static
|
|
|
|
+Profile::OTRProfileID Profile::OTRProfileID::CreateUniqueForCEF() {
|
|
|
|
+ return CreateUnique(kCEFOTRProfileIDPrefix);
|
|
|
|
+}
|
2021-04-09 20:34:45 +02:00
|
|
|
+
|
|
|
|
+bool Profile::OTRProfileID::IsUniqueForCEF() const {
|
|
|
|
+ return base::StartsWith(profile_id_, kCEFOTRProfileIDPrefix,
|
|
|
|
+ base::CompareCase::SENSITIVE);
|
|
|
|
+}
|
2021-04-07 00:09:45 +02:00
|
|
|
+
|
|
|
|
// static
|
|
|
|
Profile::OTRProfileID Profile::OTRProfileID::CreateUniqueForDevTools() {
|
|
|
|
return CreateUnique(kDevToolsOTRProfileIDPrefix);
|
|
|
|
diff --git chrome/browser/profiles/profile.h chrome/browser/profiles/profile.h
|
2022-01-25 21:26:51 +01:00
|
|
|
index ca2561e412621..febd52df6c971 100644
|
2021-04-07 00:09:45 +02:00
|
|
|
--- chrome/browser/profiles/profile.h
|
|
|
|
+++ chrome/browser/profiles/profile.h
|
2021-10-19 00:17:16 +02:00
|
|
|
@@ -98,6 +98,10 @@ class Profile : public content::BrowserContext {
|
2021-06-04 03:34:56 +02:00
|
|
|
// be applicable to run. Please see crbug.com/1098697#c3 for more details.
|
2021-04-07 00:09:45 +02:00
|
|
|
static OTRProfileID CreateUnique(const std::string& profile_id_prefix);
|
|
|
|
|
|
|
|
+ // Creates a unique OTR profile id to be used for CEF browser contexts.
|
|
|
|
+ static OTRProfileID CreateUniqueForCEF();
|
2021-04-09 20:34:45 +02:00
|
|
|
+ bool IsUniqueForCEF() const;
|
2021-04-07 00:09:45 +02:00
|
|
|
+
|
|
|
|
// Creates a unique OTR profile id to be used for DevTools browser contexts.
|
|
|
|
static OTRProfileID CreateUniqueForDevTools();
|
|
|
|
|
2021-12-16 23:35:54 +01:00
|
|
|
@@ -480,6 +484,8 @@ class Profile : public content::BrowserContext {
|
2021-04-21 00:52:34 +02:00
|
|
|
|
2021-09-20 11:06:23 +02:00
|
|
|
virtual void RecordPrimaryMainFrameNavigation() = 0;
|
2021-04-09 20:34:45 +02:00
|
|
|
|
|
|
|
+ void NotifyOffTheRecordProfileCreated(Profile* off_the_record);
|
|
|
|
+
|
|
|
|
protected:
|
2021-06-04 03:34:56 +02:00
|
|
|
// Creates an OffTheRecordProfile which points to this Profile.
|
|
|
|
static std::unique_ptr<Profile> CreateOffTheRecordProfile(
|
2021-12-16 23:35:54 +01:00
|
|
|
@@ -491,8 +497,6 @@ class Profile : public content::BrowserContext {
|
2021-04-09 20:34:45 +02:00
|
|
|
static PrefStore* CreateExtensionPrefStore(Profile*,
|
|
|
|
bool incognito_pref_store);
|
|
|
|
|
|
|
|
- void NotifyOffTheRecordProfileCreated(Profile* off_the_record);
|
|
|
|
-
|
|
|
|
// Returns whether the user has signed in this profile to an account.
|
|
|
|
virtual bool IsSignedIn() = 0;
|
|
|
|
|
|
|
|
diff --git chrome/browser/profiles/profile_impl.cc chrome/browser/profiles/profile_impl.cc
|
2022-02-21 23:23:40 +01:00
|
|
|
index bd0c693804407..c4a62b0dae176 100644
|
2021-04-09 20:34:45 +02:00
|
|
|
--- chrome/browser/profiles/profile_impl.cc
|
|
|
|
+++ chrome/browser/profiles/profile_impl.cc
|
2022-02-21 23:23:40 +01:00
|
|
|
@@ -1002,7 +1002,9 @@ Profile* ProfileImpl::GetOffTheRecordProfile(const OTRProfileID& otr_profile_id,
|
2021-04-09 20:34:45 +02:00
|
|
|
|
|
|
|
otr_profiles_[otr_profile_id] = std::move(otr_profile);
|
|
|
|
|
|
|
|
- NotifyOffTheRecordProfileCreated(raw_otr_profile);
|
|
|
|
+ // With CEF we want to delay initialization.
|
|
|
|
+ if (!otr_profile_id.IsUniqueForCEF())
|
|
|
|
+ NotifyOffTheRecordProfileCreated(raw_otr_profile);
|
|
|
|
|
|
|
|
return raw_otr_profile;
|
|
|
|
}
|
2017-07-27 01:19:27 +02:00
|
|
|
diff --git chrome/browser/profiles/profile_manager.cc chrome/browser/profiles/profile_manager.cc
|
2022-02-21 23:23:40 +01:00
|
|
|
index 6ad6467c59f58..57f35c3c6150f 100644
|
2017-07-27 01:19:27 +02:00
|
|
|
--- chrome/browser/profiles/profile_manager.cc
|
|
|
|
+++ chrome/browser/profiles/profile_manager.cc
|
2022-02-21 23:23:40 +01:00
|
|
|
@@ -494,7 +494,7 @@ ProfileManager::ProfileManager(const base::FilePath& user_data_dir)
|
2021-04-21 00:52:34 +02:00
|
|
|
base::Unretained(this)));
|
|
|
|
#endif
|
2017-09-06 23:40:58 +02:00
|
|
|
|
2017-07-27 01:19:27 +02:00
|
|
|
- if (ProfileShortcutManager::IsFeatureEnabled() && !user_data_dir_.empty())
|
|
|
|
+ if (!user_data_dir_.empty() && ProfileShortcutManager::IsFeatureEnabled())
|
2019-02-01 17:42:40 +01:00
|
|
|
profile_shortcut_manager_ = ProfileShortcutManager::Create(this);
|
|
|
|
|
2022-01-25 21:26:51 +01:00
|
|
|
zombie_metrics_timer_.Start(FROM_HERE, base::Minutes(30), this,
|
2016-07-18 23:22:22 +02:00
|
|
|
diff --git chrome/browser/profiles/profile_manager.h chrome/browser/profiles/profile_manager.h
|
2022-02-21 23:23:40 +01:00
|
|
|
index 18c384da45b1e..606d60152ebb8 100644
|
2016-07-18 23:22:22 +02:00
|
|
|
--- chrome/browser/profiles/profile_manager.h
|
|
|
|
+++ chrome/browser/profiles/profile_manager.h
|
2022-01-25 21:26:51 +01:00
|
|
|
@@ -150,7 +150,7 @@ class ProfileManager : public Profile::Delegate {
|
2016-08-04 14:37:53 +02:00
|
|
|
// acceptable. Returns null if creation of the new profile fails.
|
|
|
|
// TODO(bauerb): Migrate calls from other code to GetProfileByPath(), then
|
|
|
|
// make this method private.
|
|
|
|
- Profile* GetProfile(const base::FilePath& profile_dir);
|
|
|
|
+ virtual Profile* GetProfile(const base::FilePath& profile_dir);
|
|
|
|
|
2020-08-29 00:39:23 +02:00
|
|
|
// Returns regular or off-the-record profile given its profile key.
|
|
|
|
static Profile* GetProfileFromProfileKey(ProfileKey* profile_key);
|
2022-01-25 21:26:51 +01:00
|
|
|
@@ -182,7 +182,7 @@ class ProfileManager : public Profile::Delegate {
|
2016-07-18 23:22:22 +02:00
|
|
|
|
|
|
|
// Returns true if the profile pointer is known to point to an existing
|
|
|
|
// profile.
|
|
|
|
- bool IsValidProfile(const void* profile);
|
|
|
|
+ virtual bool IsValidProfile(const void* profile);
|
|
|
|
|
|
|
|
// Returns the directory where the first created profile is stored,
|
|
|
|
// relative to the user data directory currently in use.
|
2019-09-25 15:59:51 +02:00
|
|
|
diff --git chrome/browser/profiles/renderer_updater.cc chrome/browser/profiles/renderer_updater.cc
|
2022-01-25 21:26:51 +01:00
|
|
|
index a2c7b9c45e334..18017a6181a1e 100644
|
2019-09-25 15:59:51 +02:00
|
|
|
--- chrome/browser/profiles/renderer_updater.cc
|
|
|
|
+++ chrome/browser/profiles/renderer_updater.cc
|
2021-01-28 00:13:12 +01:00
|
|
|
@@ -8,6 +8,7 @@
|
2019-09-25 15:59:51 +02:00
|
|
|
|
|
|
|
#include "base/bind.h"
|
2021-01-28 00:13:12 +01:00
|
|
|
#include "build/chromeos_buildflags.h"
|
2020-07-04 04:51:17 +02:00
|
|
|
+#include "cef/libcef/features/runtime.h"
|
2021-08-20 01:40:49 +02:00
|
|
|
#include "chrome/browser/content_settings/content_settings_manager_delegate.h"
|
2019-09-25 15:59:51 +02:00
|
|
|
#include "chrome/browser/content_settings/host_content_settings_map_factory.h"
|
|
|
|
#include "chrome/browser/profiles/profile.h"
|
2022-01-25 21:26:51 +01:00
|
|
|
@@ -60,8 +61,12 @@ void GetGuestViewDefaultContentSettingRules(
|
2021-06-04 03:34:56 +02:00
|
|
|
} // namespace
|
2019-09-25 15:59:51 +02:00
|
|
|
|
2021-06-04 03:34:56 +02:00
|
|
|
RendererUpdater::RendererUpdater(Profile* profile) : profile_(profile) {
|
2020-07-04 04:51:17 +02:00
|
|
|
+ if (cef::IsAlloyRuntimeEnabled()) {
|
|
|
|
+ identity_manager_ = nullptr;
|
|
|
|
+ } else {
|
2021-01-28 00:13:12 +01:00
|
|
|
identity_manager_ = IdentityManagerFactory::GetForProfile(profile);
|
2021-12-16 23:35:54 +01:00
|
|
|
identity_manager_observation_.Observe(identity_manager_.get());
|
2020-07-04 04:51:17 +02:00
|
|
|
+ }
|
2021-01-28 00:13:12 +01:00
|
|
|
#if BUILDFLAG(IS_CHROMEOS_ASH)
|
2019-09-25 15:59:51 +02:00
|
|
|
oauth2_login_manager_ =
|
2021-08-20 01:40:49 +02:00
|
|
|
ash::OAuth2LoginManagerFactory::GetForProfile(profile_);
|