no modification (change of context)
This commit is contained in:
@@ -43,7 +43,7 @@ diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer
|
||||
diff --git a/components/content_settings/renderer/content_settings_agent_impl.cc b/components/content_settings/renderer/content_settings_agent_impl.cc
|
||||
--- a/components/content_settings/renderer/content_settings_agent_impl.cc
|
||||
+++ b/components/content_settings/renderer/content_settings_agent_impl.cc
|
||||
@@ -445,6 +445,14 @@ void ContentSettingsAgentImpl::ClearBlockedContentSettings() {
|
||||
@@ -473,6 +473,14 @@ void ContentSettingsAgentImpl::ClearBlockedContentSettings() {
|
||||
cached_script_permissions_.clear();
|
||||
}
|
||||
|
||||
@@ -58,7 +58,7 @@ diff --git a/components/content_settings/renderer/content_settings_agent_impl.cc
|
||||
bool ContentSettingsAgentImpl::UpdateOverrides() {
|
||||
// Evaluate the content setting rules
|
||||
ContentSetting setting = CONTENT_SETTING_ALLOW;
|
||||
@@ -455,7 +463,6 @@ bool ContentSettingsAgentImpl::UpdateOverrides() {
|
||||
@@ -483,7 +491,6 @@ bool ContentSettingsAgentImpl::UpdateOverrides() {
|
||||
}
|
||||
return UpdateTimeZoneOverride(
|
||||
setting, content_setting_rules_->timezone_override_value);
|
||||
|
||||
@@ -159,7 +159,7 @@ diff --git a/third_party/blink/renderer/platform/loader/child_url_loader_factory
|
||||
diff --git a/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.cc b/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.cc
|
||||
--- a/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.cc
|
||||
+++ b/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.cc
|
||||
@@ -2925,7 +2925,7 @@ void ResourceFetcher::PrepareForLeakDetection() {
|
||||
@@ -2939,7 +2939,7 @@ void ResourceFetcher::PrepareForLeakDetection() {
|
||||
void ResourceFetcher::StopFetchingInternal(StopFetchingTarget target) {
|
||||
// TODO(toyoshim): May want to suspend scheduler while canceling loaders so
|
||||
// that the cancellations below do not awake unnecessary scheduling.
|
||||
|
||||
@@ -1097,7 +1097,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over
|
||||
Resources res = context.getResources();
|
||||
mUpdateHost = updateHost;
|
||||
mLayerTitleCacheSupplier = layerTitleCacheSupplier;
|
||||
@@ -538,6 +550,8 @@ public class StripLayoutHelperManager
|
||||
@@ -537,6 +549,8 @@ public class StripLayoutHelperManager
|
||||
!mTabStripObscured
|
||||
&& getStripVisibilityState()
|
||||
== StripVisibilityState.VISIBLE);
|
||||
@@ -1106,7 +1106,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over
|
||||
|
||||
tabHoverCardViewStub.setOnInflateListener(
|
||||
(viewStub, view) -> {
|
||||
@@ -773,6 +787,10 @@ public class StripLayoutHelperManager
|
||||
@@ -772,6 +786,10 @@ public class StripLayoutHelperManager
|
||||
// layer should be a negative value.
|
||||
yOffset -= getHeight();
|
||||
}
|
||||
@@ -1117,7 +1117,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over
|
||||
mTabStripTreeProvider.pushAndUpdateStrip(
|
||||
this,
|
||||
mLayerTitleCacheSupplier.get(),
|
||||
@@ -786,7 +804,9 @@ public class StripLayoutHelperManager
|
||||
@@ -785,7 +803,9 @@ public class StripLayoutHelperManager
|
||||
mStripTransitionScrimOpacity,
|
||||
mLeftPadding,
|
||||
mRightPadding,
|
||||
@@ -1128,7 +1128,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over
|
||||
return mTabStripTreeProvider;
|
||||
}
|
||||
|
||||
@@ -845,11 +865,21 @@ public class StripLayoutHelperManager
|
||||
@@ -844,11 +864,21 @@ public class StripLayoutHelperManager
|
||||
mLeftPadding,
|
||||
mRightPadding);
|
||||
|
||||
|
||||
@@ -272,7 +272,7 @@ diff --git a/chrome/browser/single_tab/android/java/src/org/chromium/chrome/brow
|
||||
diff --git a/chrome/browser/single_tab/android/java/src/org/chromium/chrome/browser/single_tab/SingleTabSwitcherOnNtpMediator.java b/chrome/browser/single_tab/android/java/src/org/chromium/chrome/browser/single_tab/SingleTabSwitcherOnNtpMediator.java
|
||||
--- a/chrome/browser/single_tab/android/java/src/org/chromium/chrome/browser/single_tab/SingleTabSwitcherOnNtpMediator.java
|
||||
+++ b/chrome/browser/single_tab/android/java/src/org/chromium/chrome/browser/single_tab/SingleTabSwitcherOnNtpMediator.java
|
||||
@@ -109,6 +109,7 @@ public class SingleTabSwitcherOnNtpMediator {
|
||||
@@ -108,6 +108,7 @@ public class SingleTabSwitcherOnNtpMediator {
|
||||
mSingleTabCardClickedCallback = null;
|
||||
}
|
||||
});
|
||||
@@ -280,7 +280,7 @@ diff --git a/chrome/browser/single_tab/android/java/src/org/chromium/chrome/brow
|
||||
mPropertyModel.set(
|
||||
SEE_MORE_LINK_CLICK_LISTENER,
|
||||
() -> {
|
||||
@@ -267,14 +268,14 @@ public class SingleTabSwitcherOnNtpMediator {
|
||||
@@ -266,14 +267,14 @@ public class SingleTabSwitcherOnNtpMediator {
|
||||
public void onPageLoadFinished(Tab tab, GURL url) {
|
||||
super.onPageLoadFinished(tab, url);
|
||||
mPropertyModel.set(TITLE, tab.getTitle());
|
||||
|
||||
@@ -847,7 +847,7 @@ diff --git a/components/content_settings/renderer/content_settings_agent_impl.cc
|
||||
|
||||
blink::WebLocalFrame* frame = render_frame()->GetWebFrame();
|
||||
if (frame->Parent())
|
||||
@@ -442,4 +445,78 @@ void ContentSettingsAgentImpl::ClearBlockedContentSettings() {
|
||||
@@ -470,4 +473,78 @@ void ContentSettingsAgentImpl::ClearBlockedContentSettings() {
|
||||
cached_script_permissions_.clear();
|
||||
}
|
||||
|
||||
@@ -941,7 +941,7 @@ diff --git a/components/content_settings/renderer/content_settings_agent_impl.h
|
||||
namespace blink {
|
||||
class WebFrame;
|
||||
class WebURL;
|
||||
@@ -164,6 +169,12 @@ class ContentSettingsAgentImpl
|
||||
@@ -166,6 +171,12 @@ class ContentSettingsAgentImpl
|
||||
std::unique_ptr<Delegate> delegate_;
|
||||
|
||||
mojo::AssociatedReceiverSet<mojom::ContentSettingsAgent> receivers_;
|
||||
|
||||
@@ -268,7 +268,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
|
||||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeBrowserInitializer.java b/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeBrowserInitializer.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeBrowserInitializer.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeBrowserInitializer.java
|
||||
@@ -21,6 +21,7 @@ import org.chromium.chrome.browser.profiles.ProfileManager;
|
||||
@@ -22,6 +22,7 @@ import org.chromium.chrome.browser.profiles.ProfileManager;
|
||||
import org.chromium.chrome.browser.signin.SigninCheckerProvider;
|
||||
import org.chromium.components.background_task_scheduler.BackgroundTaskSchedulerFactory;
|
||||
import org.chromium.content_public.browser.BrowserStartupController;
|
||||
@@ -276,7 +276,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeBrow
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
@@ -229,11 +230,13 @@ public class ChromeBrowserInitializer {
|
||||
@@ -231,11 +232,13 @@ public class ChromeBrowserInitializer {
|
||||
|
||||
@Override
|
||||
public void onSuccess() {
|
||||
|
||||
Reference in New Issue
Block a user