mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2024-12-12 01:26:03 +01:00
160 lines
7.0 KiB
Diff
160 lines
7.0 KiB
Diff
diff --git chrome/browser/profiles/off_the_record_profile_impl.cc chrome/browser/profiles/off_the_record_profile_impl.cc
|
|
index a9c0c34999035..5fbf5eb462e42 100644
|
|
--- chrome/browser/profiles/off_the_record_profile_impl.cc
|
|
+++ chrome/browser/profiles/off_the_record_profile_impl.cc
|
|
@@ -634,7 +634,9 @@ std::unique_ptr<Profile> Profile::CreateOffTheRecordProfile(
|
|
#endif
|
|
if (!profile)
|
|
profile = std::make_unique<OffTheRecordProfileImpl>(parent, otr_profile_id);
|
|
- profile->Init();
|
|
+ // With CEF we want to delay initialization.
|
|
+ if (!otr_profile_id.IsUniqueForCEF())
|
|
+ profile->Init();
|
|
return std::move(profile);
|
|
}
|
|
|
|
diff --git chrome/browser/profiles/profile.cc chrome/browser/profiles/profile.cc
|
|
index 02a724e47ba2e..4fa0dbefeecbc 100644
|
|
--- chrome/browser/profiles/profile.cc
|
|
+++ chrome/browser/profiles/profile.cc
|
|
@@ -83,6 +83,7 @@ base::LazyInstance<std::set<content::BrowserContext*>>::Leaky
|
|
|
|
namespace {
|
|
|
|
+const char kCEFOTRProfileIDPrefix[] = "CEF::BrowserContext";
|
|
const char kDevToolsOTRProfileIDPrefix[] = "Devtools::BrowserContext";
|
|
const char kMediaRouterOTRProfileIDPrefix[] = "MediaRouter::Presentation";
|
|
const char kTestOTRProfileIDPrefix[] = "Test::OTR";
|
|
@@ -99,6 +100,8 @@ bool Profile::OTRProfileID::AllowsBrowserWindows() const {
|
|
// 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,
|
|
@@ -120,6 +123,16 @@ Profile::OTRProfileID Profile::OTRProfileID::CreateUnique(
|
|
base::GUID::GenerateRandomV4().AsLowercaseString().c_str()));
|
|
}
|
|
|
|
+// static
|
|
+Profile::OTRProfileID Profile::OTRProfileID::CreateUniqueForCEF() {
|
|
+ return CreateUnique(kCEFOTRProfileIDPrefix);
|
|
+}
|
|
+
|
|
+bool Profile::OTRProfileID::IsUniqueForCEF() const {
|
|
+ return base::StartsWith(profile_id_, kCEFOTRProfileIDPrefix,
|
|
+ base::CompareCase::SENSITIVE);
|
|
+}
|
|
+
|
|
// static
|
|
Profile::OTRProfileID Profile::OTRProfileID::CreateUniqueForDevTools() {
|
|
return CreateUnique(kDevToolsOTRProfileIDPrefix);
|
|
diff --git chrome/browser/profiles/profile.h chrome/browser/profiles/profile.h
|
|
index ca2561e412621..febd52df6c971 100644
|
|
--- chrome/browser/profiles/profile.h
|
|
+++ chrome/browser/profiles/profile.h
|
|
@@ -98,6 +98,10 @@ class Profile : public content::BrowserContext {
|
|
// be applicable to run. Please see crbug.com/1098697#c3 for more details.
|
|
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();
|
|
+ bool IsUniqueForCEF() const;
|
|
+
|
|
// Creates a unique OTR profile id to be used for DevTools browser contexts.
|
|
static OTRProfileID CreateUniqueForDevTools();
|
|
|
|
@@ -480,6 +484,8 @@ class Profile : public content::BrowserContext {
|
|
|
|
virtual void RecordPrimaryMainFrameNavigation() = 0;
|
|
|
|
+ void NotifyOffTheRecordProfileCreated(Profile* off_the_record);
|
|
+
|
|
protected:
|
|
// Creates an OffTheRecordProfile which points to this Profile.
|
|
static std::unique_ptr<Profile> CreateOffTheRecordProfile(
|
|
@@ -491,8 +497,6 @@ class Profile : public content::BrowserContext {
|
|
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
|
|
index 8b4be2abc03ec..8f53f25103358 100644
|
|
--- chrome/browser/profiles/profile_impl.cc
|
|
+++ chrome/browser/profiles/profile_impl.cc
|
|
@@ -996,7 +996,9 @@ Profile* ProfileImpl::GetOffTheRecordProfile(const OTRProfileID& otr_profile_id,
|
|
|
|
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;
|
|
}
|
|
diff --git chrome/browser/profiles/profile_manager.cc chrome/browser/profiles/profile_manager.cc
|
|
index 7d959397bcb72..188d552d065c8 100644
|
|
--- chrome/browser/profiles/profile_manager.cc
|
|
+++ chrome/browser/profiles/profile_manager.cc
|
|
@@ -517,7 +517,7 @@ ProfileManager::ProfileManager(const base::FilePath& user_data_dir)
|
|
base::Unretained(this)));
|
|
#endif
|
|
|
|
- if (ProfileShortcutManager::IsFeatureEnabled() && !user_data_dir_.empty())
|
|
+ if (!user_data_dir_.empty() && ProfileShortcutManager::IsFeatureEnabled())
|
|
profile_shortcut_manager_ = ProfileShortcutManager::Create(this);
|
|
|
|
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 f3c58cfa9b0f8..745bff6a12b66 100644
|
|
--- chrome/browser/profiles/profile_manager.h
|
|
+++ chrome/browser/profiles/profile_manager.h
|
|
@@ -153,7 +153,7 @@ class ProfileManager : public Profile::Delegate {
|
|
// 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);
|
|
|
|
// Returns regular or off-the-record profile given its profile key.
|
|
static Profile* GetProfileFromProfileKey(ProfileKey* profile_key);
|
|
@@ -185,7 +185,7 @@ class ProfileManager : public Profile::Delegate {
|
|
|
|
// 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.
|
|
diff --git chrome/browser/profiles/renderer_updater.cc chrome/browser/profiles/renderer_updater.cc
|
|
index 6ccdfa7f3cc46..f8668efcc77f6 100644
|
|
--- chrome/browser/profiles/renderer_updater.cc
|
|
+++ chrome/browser/profiles/renderer_updater.cc
|
|
@@ -8,6 +8,7 @@
|
|
|
|
#include "base/bind.h"
|
|
#include "build/chromeos_buildflags.h"
|
|
+#include "cef/libcef/features/runtime.h"
|
|
#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"
|
|
@@ -35,8 +36,10 @@ RendererUpdater::RendererUpdater(Profile* profile)
|
|
: profile_(profile),
|
|
is_off_the_record_(profile_->IsOffTheRecord()),
|
|
original_profile_(profile->GetOriginalProfile()) {
|
|
+ if (!cef::IsAlloyRuntimeEnabled()) {
|
|
identity_manager_observation_.Observe(
|
|
IdentityManagerFactory::GetForProfile(original_profile_));
|
|
+ }
|
|
|
|
#if BUILDFLAG(IS_CHROMEOS_ASH)
|
|
oauth2_login_manager_ =
|