-
-
Save uazo/89608436196ac921a0ac25d0deff7d38 to your computer and use it in GitHub Desktop.
diff --git a/chrome/android/java/res/values/values.xml b/chrome/android/java/res/values/values.xml | |
index 0c83723392..3739ae8ec5 100644 | |
--- a/chrome/android/java/res/values/values.xml | |
+++ b/chrome/android/java/res/values/values.xml | |
@@ -14,9 +14,6 @@ | |
<item name="top_controls_show_threshold" format="float" type="dimen">0.5</item> | |
<item name="top_controls_hide_threshold" format="float" type="dimen">0.5</item> | |
- <string name="allow_custom_tab_intents_title">Allow custom tab intents from applications</string> | |
- <string name="allow_custom_tab_intents_summary">When disabled, all custom tab intents will be processed as regular navigation instead</string> | |
- | |
<!-- The number of thumbnails that the thumbnail cache can hold. --> | |
<integer name="default_thumbnail_cache_size">5</integer> | |
<!-- The number of approximation thumbnails that the approximation cache can hold. --> | |
@@ -31,9 +28,6 @@ | |
<!-- TabSwitcher - Maximum amount to tilt tabs in over scroll in degrees. --> | |
<integer name="over_scroll_angle">15</integer> | |
- <string name="close_tabs_on_exit_title">Close tabs on exit</string> | |
- <string name="close_tabs_on_exit_summary">Don\'t persist tabs between browsing sessions</string> | |
- | |
<!-- Toolbar/AppMenu - Drawable level on reload image button --> | |
<integer name="reload_button_level_reload">0</integer> | |
<integer name="reload_button_level_stop">1</integer> | |
diff --git a/chrome/android/java/res/xml/languages_detailed_preferences.xml b/chrome/android/java/res/xml/languages_detailed_preferences.xml | |
index 6bff063471..6945e7f65f 100644 | |
--- a/chrome/android/java/res/xml/languages_detailed_preferences.xml | |
+++ b/chrome/android/java/res/xml/languages_detailed_preferences.xml | |
@@ -11,9 +11,4 @@ | |
android:layout="@layout/languages_preference" | |
android:widgetLayout="@layout/accept_languages_list" /> | |
- <org.chromium.components.browser_ui.settings.ChromeSwitchPreference | |
- android:key="translate_switch" | |
- android:summaryOn="@string/languages_offer_translate_switch" | |
- android:summaryOff="@string/languages_offer_translate_switch" /> | |
- | |
</PreferenceScreen> | |
diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml | |
index 4811922c73..5ff8d44662 100644 | |
--- a/chrome/android/java/res/xml/privacy_preferences.xml | |
+++ b/chrome/android/java/res/xml/privacy_preferences.xml | |
@@ -22,17 +22,17 @@ | |
android:summary="@string/preload_pages_summary" | |
android:persistent="false" | |
android:order="1"/> | |
- <org.chromium.components.browser_ui.settings.ChromeBaseCheckBoxPreference | |
+ <org.chromium.components.browser_ui.settings.ChromeSwitchPreference | |
android:key="always_incognito" | |
android:title="@string/always_incognito_title" | |
android:summary="@string/always_incognito_summary" | |
android:defaultValue="false" /> | |
- <org.chromium.components.browser_ui.settings.ChromeBaseCheckBoxPreference | |
+ <org.chromium.components.browser_ui.settings.ChromeSwitchPreference | |
android:key="close_tabs_on_exit" | |
android:title="@string/close_tabs_on_exit_title" | |
android:summary="@string/close_tabs_on_exit_summary" | |
android:defaultValue="false" /> | |
- <org.chromium.components.browser_ui.settings.ChromeBaseCheckBoxPreference | |
+ <org.chromium.components.browser_ui.settings.ChromeSwitchPreference | |
android:key="incognito_history_enabled" | |
android:title="@string/incognito_history_enabled_title" | |
android:summary="@string/incognito_history_enabled_summary" | |
@@ -42,7 +42,7 @@ | |
android:key="do_not_track" | |
android:title="@string/do_not_track_title" | |
android:order="3"/> | |
- <org.chromium.components.browser_ui.settings.ChromeBaseCheckBoxPreference | |
+ <org.chromium.components.browser_ui.settings.ChromeSwitchPreference | |
android:key="allow_custom_tab_intents" | |
android:title="@string/allow_custom_tab_intents_title" | |
android:summary="@string/allow_custom_tab_intents_summary" | |
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java | |
index aff04347ec..4472fd279d 100644 | |
--- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java | |
+++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java | |
@@ -211,6 +211,7 @@ import org.chromium.webapk.lib.client.WebApkNavigationClient; | |
import org.chromium.chrome.browser.tabmodel.TabWindowManager; | |
import org.chromium.chrome.browser.preferences.ChromePreferenceKeys; | |
import org.chromium.chrome.browser.preferences.SharedPreferencesManager; | |
+import org.chromium.url.GURL; | |
import java.util.ArrayList; | |
import java.util.List; | |
@@ -1482,7 +1483,7 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent> | |
mMostVisitedSites = | |
SuggestionsDependencyFactory.getInstance().createMostVisitedSites(Profile.getLastUsedRegularProfile()); | |
} | |
- mMostVisitedSites.removeBlocklistedUrl(tabToBookmark.getOriginalUrl()); | |
+ mMostVisitedSites.removeBlocklistedUrl(new GURL(tabToBookmark.getOriginalUrl())); | |
// Note we get user bookmark ID over just a bookmark ID here: Managed bookmarks can't be | |
// edited. If the current URL is only bookmarked by managed bookmarks, this will return | |
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/language/AppLocaleUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/language/AppLocaleUtils.java | |
index f987b7ddba..b0d9eb18e1 100644 | |
--- a/chrome/android/java/src/org/chromium/chrome/browser/language/AppLocaleUtils.java | |
+++ b/chrome/android/java/src/org/chromium/chrome/browser/language/AppLocaleUtils.java | |
@@ -8,10 +8,10 @@ import android.content.Context; | |
import android.preference.PreferenceManager; | |
import android.text.TextUtils; | |
-import com.google.android.play.core.splitcompat.SplitCompat; | |
-import com.google.android.play.core.splitinstall.SplitInstallManager; | |
-import com.google.android.play.core.splitinstall.SplitInstallManagerFactory; | |
-import com.google.android.play.core.splitinstall.SplitInstallRequest; | |
+// import com.google.android.play.core.splitcompat.SplitCompat; | |
+// import com.google.android.play.core.splitinstall.SplitInstallManager; | |
+// import com.google.android.play.core.splitinstall.SplitInstallManagerFactory; | |
+// import com.google.android.play.core.splitinstall.SplitInstallRequest; | |
import org.chromium.base.BundleUtils; | |
import org.chromium.base.ContextUtils; | |
@@ -75,25 +75,25 @@ public class AppLocaleUtils { | |
* @param context Activity context to enable downloaded language splits on. | |
*/ | |
public static void maybeInstallActivitySplitCompat(Context context) { | |
- if (GlobalAppLocaleController.getInstance().isOverridden() && BundleUtils.isBundle()) { | |
- SplitCompat.installActivity(context); | |
- } | |
+ // if (GlobalAppLocaleController.getInstance().isOverridden() && BundleUtils.isBundle()) { | |
+ // SplitCompat.installActivity(context); | |
+ // } | |
} | |
/** | |
* For bundle builds ensure that the language split for languageName is download. | |
*/ | |
private static void ensureLaguageSplitInstalled(String languageName) { | |
- SplitInstallManager splitInstallManager = | |
- SplitInstallManagerFactory.create(ContextUtils.getApplicationContext()); | |
+ // SplitInstallManager splitInstallManager = | |
+ // SplitInstallManagerFactory.create(ContextUtils.getApplicationContext()); | |
- // TODO(perrier): check if languageName is already installed. https://crbug.com/1103806 | |
- if (languageName != null) { | |
- SplitInstallRequest installRequest = | |
- SplitInstallRequest.newBuilder() | |
- .addLanguage(Locale.forLanguageTag(languageName)) | |
- .build(); | |
- splitInstallManager.startInstall(installRequest); | |
- } | |
+ // // TODO(perrier): check if languageName is already installed. https://crbug.com/1103806 | |
+ // if (languageName != null) { | |
+ // SplitInstallRequest installRequest = | |
+ // SplitInstallRequest.newBuilder() | |
+ // .addLanguage(Locale.forLanguageTag(languageName)) | |
+ // .build(); | |
+ // splitInstallManager.startInstall(installRequest); | |
+ // } | |
} | |
} | |
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/promo/enhanced_protection/EnhancedProtectionPromoController.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/promo/enhanced_protection/EnhancedProtectionPromoController.java | |
index 3cb6c0e539..9a0bd992f0 100644 | |
--- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/promo/enhanced_protection/EnhancedProtectionPromoController.java | |
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/promo/enhanced_protection/EnhancedProtectionPromoController.java | |
@@ -16,8 +16,8 @@ import androidx.appcompat.content.res.AppCompatResources; | |
import org.chromium.chrome.R; | |
import org.chromium.chrome.browser.ntp.cards.promo.enhanced_protection.EnhancedProtectionPromoUtils.EnhancedProtectionPromoAction; | |
import org.chromium.chrome.browser.profiles.Profile; | |
-import org.chromium.chrome.browser.safe_browsing.metrics.SettingsAccessPoint; | |
-import org.chromium.chrome.browser.safe_browsing.settings.SecuritySettingsFragment; | |
+// import org.chromium.chrome.browser.safe_browsing.metrics.SettingsAccessPoint; | |
+// import org.chromium.chrome.browser.safe_browsing.settings.SecuritySettingsFragment; | |
import org.chromium.chrome.browser.settings.SettingsLauncher; | |
import org.chromium.chrome.browser.settings.SettingsLauncherImpl; | |
import org.chromium.components.browser_ui.widget.promo.PromoCardCoordinator; | |
@@ -171,12 +171,12 @@ public class EnhancedProtectionPromoController { | |
} | |
private void onPrimaryButtonClicked() { | |
- EnhancedProtectionPromoUtils.recordEnhancedProtectionPromoEvent( | |
- EnhancedProtectionPromoAction.ACCEPTED); | |
- SettingsLauncher launcher = new SettingsLauncherImpl(); | |
- launcher.launchSettingsActivity(mContext, SecuritySettingsFragment.class, | |
- SecuritySettingsFragment.createArguments( | |
- SettingsAccessPoint.SURFACE_EXPLORER_PROMO_SLINGER)); | |
+ // EnhancedProtectionPromoUtils.recordEnhancedProtectionPromoEvent( | |
+ // EnhancedProtectionPromoAction.ACCEPTED); | |
+ // SettingsLauncher launcher = new SettingsLauncherImpl(); | |
+ // launcher.launchSettingsActivity(mContext, SecuritySettingsFragment.class, | |
+ // SecuritySettingsFragment.createArguments( | |
+ // SettingsAccessPoint.SURFACE_EXPLORER_PROMO_SLINGER)); | |
} | |
private void onPromoSeen() { | |
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/promo/enhanced_protection/EnhancedProtectionPromoUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/promo/enhanced_protection/EnhancedProtectionPromoUtils.java | |
index 347b0ab108..ccf7dc4018 100644 | |
--- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/promo/enhanced_protection/EnhancedProtectionPromoUtils.java | |
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/promo/enhanced_protection/EnhancedProtectionPromoUtils.java | |
@@ -65,8 +65,8 @@ final class EnhancedProtectionPromoUtils { | |
// TODO(bdea): If the user has pressed "Continue" and not selected Enhanced Protection, | |
// should we still show the promo. | |
return (profile != null) && !UserPrefs.get(profile).getBoolean(Pref.SAFE_BROWSING_ENHANCED) | |
- && !isPromoDismissedInSharedPreference() && (timesSeen <= maxImpressions) | |
- && !SafeBrowsingBridge.isSafeBrowsingManaged(); | |
+ && !isPromoDismissedInSharedPreference() && (timesSeen <= maxImpressions); | |
+ //&& !SafeBrowsingBridge.isSafeBrowsingManaged(); | |
} | |
static boolean isPromoDismissedInSharedPreference() { | |
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java | |
index 862e4a5b4b..8588ec892e 100644 | |
--- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java | |
+++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java | |
@@ -144,8 +144,8 @@ public class PrivacySettings | |
Preference secureDnsPref = findPreference(PREF_SECURE_DNS); | |
secureDnsPref.setVisible(SecureDnsSettings.isUiEnabled()); | |
- ChromeBaseCheckBoxPreference historyInIncognitoPref = | |
- (ChromeBaseCheckBoxPreference) findPreference(PREF_INCOGNITO_TAB_HISTORY_ENABLED); | |
+ ChromeSwitchPreference historyInIncognitoPref = | |
+ (ChromeSwitchPreference) findPreference(PREF_INCOGNITO_TAB_HISTORY_ENABLED); | |
historyInIncognitoPref.setOnPreferenceChangeListener(this); | |
historyInIncognitoPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate); | |
@@ -209,8 +209,8 @@ public class PrivacySettings | |
canMakePaymentPref.setChecked(prefService.getBoolean(Pref.CAN_MAKE_PAYMENT_ENABLED)); | |
} | |
- ChromeBaseCheckBoxPreference allowCustomTabIntentsPref = | |
- (ChromeBaseCheckBoxPreference) findPreference(PREF_ALLOW_CUSTOM_TAB_INTENTS); | |
+ ChromeSwitchPreference allowCustomTabIntentsPref = | |
+ (ChromeSwitchPreference) findPreference(PREF_ALLOW_CUSTOM_TAB_INTENTS); | |
allowCustomTabIntentsPref.setOnPreferenceChangeListener(this); | |
allowCustomTabIntentsPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate); | |
@@ -226,13 +226,13 @@ public class PrivacySettings | |
secureDnsPref.setSummary(SecureDnsSettings.getSummary(getContext())); | |
} | |
- ChromeBaseCheckBoxPreference closeTabsOnExitPref = | |
- (ChromeBaseCheckBoxPreference) findPreference(PREF_CLOSE_TABS_ON_EXIT); | |
+ ChromeSwitchPreference closeTabsOnExitPref = | |
+ (ChromeSwitchPreference) findPreference(PREF_CLOSE_TABS_ON_EXIT); | |
closeTabsOnExitPref.setOnPreferenceChangeListener(this); | |
closeTabsOnExitPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate); | |
- CheckBoxPreference historyInIncognitoPref = | |
- (CheckBoxPreference) findPreference(PREF_INCOGNITO_TAB_HISTORY_ENABLED); | |
+ ChromeSwitchPreference historyInIncognitoPref = | |
+ (ChromeSwitchPreference) findPreference(PREF_INCOGNITO_TAB_HISTORY_ENABLED); | |
if (historyInIncognitoPref != null) { | |
historyInIncognitoPref.setChecked( | |
prefService.getBoolean(Pref.INCOGNITO_TAB_HISTORY_ENABLED)); | |
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingSettingsLauncher.java b/chrome/android/java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingSettingsLauncher.java | |
index 74a48f1027..bc0f3e376a 100644 | |
--- a/chrome/android/java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingSettingsLauncher.java | |
+++ b/chrome/android/java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingSettingsLauncher.java | |
@@ -6,8 +6,8 @@ package org.chromium.chrome.browser.safe_browsing; | |
import android.content.Context; | |
import org.chromium.base.annotations.CalledByNative; | |
-import org.chromium.chrome.browser.safe_browsing.metrics.SettingsAccessPoint; | |
-import org.chromium.chrome.browser.safe_browsing.settings.SecuritySettingsFragment; | |
+// import org.chromium.chrome.browser.safe_browsing.metrics.SettingsAccessPoint; | |
+// import org.chromium.chrome.browser.safe_browsing.settings.SecuritySettingsFragment; | |
import org.chromium.chrome.browser.settings.SettingsLauncher; | |
import org.chromium.chrome.browser.settings.SettingsLauncherImpl; | |
import org.chromium.content_public.browser.WebContents; | |
@@ -21,12 +21,12 @@ public class SafeBrowsingSettingsLauncher { | |
@CalledByNative | |
private static void showSafeBrowsingSettings(WebContents webContents) { | |
- WindowAndroid window = webContents.getTopLevelNativeWindow(); | |
- if (window == null) return; | |
- Context currentContext = window.getContext().get(); | |
- SettingsLauncher settingsLauncher = new SettingsLauncherImpl(); | |
- settingsLauncher.launchSettingsActivity(currentContext, SecuritySettingsFragment.class, | |
- SecuritySettingsFragment.createArguments( | |
- SettingsAccessPoint.SECURITY_INTERSTITIAL)); | |
+ // WindowAndroid window = webContents.getTopLevelNativeWindow(); | |
+ // if (window == null) return; | |
+ // Context currentContext = window.getContext().get(); | |
+ // SettingsLauncher settingsLauncher = new SettingsLauncherImpl(); | |
+ // settingsLauncher.launchSettingsActivity(currentContext, SecuritySettingsFragment.class, | |
+ // SecuritySettingsFragment.createArguments( | |
+ // SettingsAccessPoint.SECURITY_INTERSTITIAL)); | |
} | |
} | |
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/SyncSettingsUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/SyncSettingsUtils.java | |
index 009effc97d..4dccd4aa13 100644 | |
--- a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/SyncSettingsUtils.java | |
+++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/SyncSettingsUtils.java | |
@@ -256,23 +256,23 @@ public class SyncSettingsUtils { | |
} | |
boolean syncEnabled = AndroidSyncSettings.get().isSyncEnabled(); | |
- if (syncEnabled) { | |
- if (!profileSyncService.isSyncActive()) { | |
- return res.getString(R.string.sync_setup_progress); | |
- } | |
- | |
- if (profileSyncService.isPassphraseRequiredForPreferredDataTypes()) { | |
- return res.getString(R.string.sync_need_passphrase); | |
- } | |
- | |
- if (profileSyncService.isTrustedVaultKeyRequiredForPreferredDataTypes()) { | |
- return profileSyncService.isEncryptEverythingEnabled() | |
- ? context.getString(R.string.sync_error_card_title) | |
- : context.getString(R.string.sync_passwords_error_card_title); | |
- } | |
- | |
- return context.getString(R.string.sync_and_services_summary_sync_on); | |
- } | |
+ // if (syncEnabled) { | |
+ // if (!profileSyncService.isSyncActive()) { | |
+ // return res.getString(R.string.sync_setup_progress); | |
+ // } | |
+ | |
+ // if (profileSyncService.isPassphraseRequiredForPreferredDataTypes()) { | |
+ // return res.getString(R.string.sync_need_passphrase); | |
+ // } | |
+ | |
+ // if (profileSyncService.isTrustedVaultKeyRequiredForPreferredDataTypes()) { | |
+ // return profileSyncService.isEncryptEverythingEnabled() | |
+ // ? context.getString(R.string.sync_error_card_title) | |
+ // : context.getString(R.string.sync_passwords_error_card_title); | |
+ // } | |
+ | |
+ // return context.getString(R.string.sync_and_services_summary_sync_on); | |
+ // } | |
return context.getString(R.string.sync_is_disabled); | |
} | |
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn | |
index 6e6498f6d0..e416595162 100644 | |
--- a/chrome/browser/BUILD.gn | |
+++ b/chrome/browser/BUILD.gn | |
@@ -1823,6 +1823,8 @@ static_library("browser") { | |
"web_data_service_factory.h", | |
"window_placement/window_placement_permission_context.cc", | |
"window_placement/window_placement_permission_context.h", | |
+ "importer/profile_writer.cc", | |
+ "importer/profile_writer.h", | |
] | |
configs += [ | |
diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc | |
index c84f395a55..ce5bac1655 100644 | |
--- a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc | |
+++ b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc | |
@@ -658,10 +658,12 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData( | |
base::RecordAction(UserMetricsAction("ClearBrowsingData_Cookies")); | |
network::mojom::NetworkContext* safe_browsing_context = nullptr; | |
+#if BUILDFLAG(FULL_SAFE_BROWSING) | |
safe_browsing::SafeBrowsingService* sb_service = | |
g_browser_process->safe_browsing_service(); | |
if (sb_service) | |
safe_browsing_context = sb_service->GetNetworkContext(profile_); | |
+#endif | |
browsing_data::RemoveEmbedderCookieData( | |
delete_begin, delete_end, filter_builder, host_content_settings_map_, | |
diff --git a/chrome/browser/permissions/abusive_origin_permission_revocation_request.cc b/chrome/browser/permissions/abusive_origin_permission_revocation_request.cc | |
index a20936c830..5838afafcb 100644 | |
--- a/chrome/browser/permissions/abusive_origin_permission_revocation_request.cc | |
+++ b/chrome/browser/permissions/abusive_origin_permission_revocation_request.cc | |
@@ -122,6 +122,7 @@ void AbusiveOriginPermissionRevocationRequest::CheckAndRevokeIfAbusive() { | |
return; | |
} | |
+#if BUILDFLAG(FULL_SAFE_BROWSING) | |
CrowdDenyPreloadData* crowd_deny = CrowdDenyPreloadData::GetInstance(); | |
permissions::PermissionUmaUtil::RecordCrowdDenyIsLoadedAtAbuseCheckTime( | |
crowd_deny->is_loaded_from_disk()); | |
@@ -147,6 +148,7 @@ void AbusiveOriginPermissionRevocationRequest::CheckAndRevokeIfAbusive() { | |
return; | |
} | |
} | |
+#endif | |
std::move(callback_).Run(Outcome::PERMISSION_NOT_REVOKED); | |
} | |
diff --git a/chrome/browser/safe_browsing/url_lookup_service_factory.cc b/chrome/browser/safe_browsing/url_lookup_service_factory.cc | |
index 5e9d23d85a..b007078c8a 100644 | |
--- a/chrome/browser/safe_browsing/url_lookup_service_factory.cc | |
+++ b/chrome/browser/safe_browsing/url_lookup_service_factory.cc | |
@@ -50,6 +50,7 @@ RealTimeUrlLookupServiceFactory::RealTimeUrlLookupServiceFactory() | |
KeyedService* RealTimeUrlLookupServiceFactory::BuildServiceInstanceFor( | |
content::BrowserContext* context) const { | |
+#if BUILDFLAG(FULL_SAFE_BROWSING) | |
if (!g_browser_process->safe_browsing_service()) { | |
return nullptr; | |
} | |
@@ -74,6 +75,9 @@ KeyedService* RealTimeUrlLookupServiceFactory::BuildServiceInstanceFor( | |
GetProfileManagementStatus(browser_policy_connector), | |
is_under_advanced_protection, profile->IsOffTheRecord(), | |
g_browser_process->variations_service()); | |
+#else | |
+ return nullptr; | |
+#endif | |
} | |
} // namespace safe_browsing | |
diff --git a/chrome/browser/subresource_filter/chrome_subresource_filter_client.cc b/chrome/browser/subresource_filter/chrome_subresource_filter_client.cc | |
index 2ff05516ab..bf828175f1 100644 | |
--- a/chrome/browser/subresource_filter/chrome_subresource_filter_client.cc | |
+++ b/chrome/browser/subresource_filter/chrome_subresource_filter_client.cc | |
@@ -97,7 +97,6 @@ ChromeSubresourceFilterClient::OnPageActivationComputed( | |
subresource_filter::mojom::ActivationLevel::kEnabled; | |
*decision = subresource_filter::ActivationDecision::FORCED_ACTIVATION; | |
} | |
-#endif | |
const GURL& url(navigation_handle->GetURL()); | |
@@ -168,10 +167,14 @@ void ChromeSubresourceFilterClient::AllowlistByContentSettings( | |
const scoped_refptr<safe_browsing::SafeBrowsingDatabaseManager> | |
ChromeSubresourceFilterClient::GetSafeBrowsingDatabaseManager() { | |
+#if BUILDFLAG(FULL_SAFE_BROWSING) | |
safe_browsing::SafeBrowsingService* safe_browsing_service = | |
g_browser_process->safe_browsing_service(); | |
return safe_browsing_service ? safe_browsing_service->database_manager() | |
: nullptr; | |
+#else | |
+ return nullptr; | |
+#endif | |
} | |
void ChromeSubresourceFilterClient::ToggleForceActivationInCurrentWebContents( | |
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_it.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_it.xtb | |
index b914db8c15..72e9507078 100644 | |
--- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_it.xtb | |
+++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_it.xtb | |
@@ -1142,6 +1142,4 @@ I dati della sessione in incognito vengono cancellati da Chrome soltanto quando | |
<translation id="983192555821071799">Chiudi tutte le schede</translation> | |
<translation id="987264212798334818">Generali</translation> | |
<translation id="996149300115483134">Menu scheda feed chiuso</translation> | |
-<translation id="7889537574758531583">Abilita la cronologia nelle sessioni in incognito</translation> | |
-<translation id="5713583121562162330">Abilita la registrazione della navigazione nella cronologia anche per le sessioni in incognito</translation> | |
</translationbundle> | |
diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java | |
index a582d5a405..59bdf17102 100644 | |
--- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java | |
+++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java | |
@@ -879,7 +879,8 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment | |
private void setUpAutoplayPreference(Preference preference) { | |
@ContentSettingValues | |
@Nullable | |
- Integer currentValue = mSite.getContentSettingPermission(ContentSettingsType.AUTOPLAY); | |
+ Integer currentValue = mSite.getContentSetting( | |
+ getSiteSettingsClient().getBrowserContextHandle(), ContentSettingsType.AUTOPLAY); | |
// In order to always show the autoplay permission, set it up with the default value if it | |
// doesn't have a current value. | |
if (currentValue == null) { | |
@@ -934,7 +935,8 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment | |
@ContentSettingValues | |
@Nullable | |
Integer currentValue = | |
- mSite.getContentSettingPermission(ContentSettingsType.COOKIES); | |
+ mSite.getContentSetting( | |
+ getSiteSettingsClient().getBrowserContextHandle(), ContentSettingsType.COOKIES); | |
// Always show the cookies permission | |
if (currentValue == null) { | |
currentValue = WebsitePreferenceBridge.isCategoryEnabled( | |
diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/WebsitePreferenceBridge.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/WebsitePreferenceBridge.java | |
index e57cb07f5d..acc3ece60e 100644 | |
--- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/WebsitePreferenceBridge.java | |
+++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/WebsitePreferenceBridge.java | |
@@ -63,7 +63,8 @@ public class WebsitePreferenceBridge { | |
} else if (type == ContentSettingsType.NOTIFICATIONS) { | |
WebsitePreferenceBridgeJni.get().getNotificationOrigins(browserContextHandle, list); | |
} else if (type == ContentSettingsType.AUTOPLAY) { | |
- WebsitePreferenceBridgeJni.get().getAutoplayOrigins(browserContextHandle, list); | |
+ WebsitePreferenceBridgeJni.get().getAutoplayOrigins( | |
+ browserContextHandle, list, false); | |
} else if (type == ContentSettingsType.PROTECTED_MEDIA_IDENTIFIER) { | |
WebsitePreferenceBridgeJni.get().getProtectedMediaIdentifierOrigins( | |
browserContextHandle, list); | |
@@ -446,7 +447,8 @@ public class WebsitePreferenceBridge { | |
BrowserContextHandle browserContextHandle, Object list, boolean managedOnly); | |
void getMidiOrigins(BrowserContextHandle browserContextHandle, Object list); | |
void getNotificationOrigins(BrowserContextHandle browserContextHandle, Object list); | |
- void getAutoplayOrigins(BrowserContextHandle browserContextHandle, Object list); | |
+ void getAutoplayOrigins( | |
+ BrowserContextHandle browserContextHandle, Object list, boolean managedOnly); | |
void getNfcOrigins(BrowserContextHandle browserContextHandle, Object list); | |
void getProtectedMediaIdentifierOrigins( | |
BrowserContextHandle browserContextHandle, Object list); | |
diff --git a/components/safe_browsing/core/file_type_policies.cc b/components/safe_browsing/core/file_type_policies.cc | |
index 30df9b49f2..ffa3ae70c1 100644 | |
--- a/components/safe_browsing/core/file_type_policies.cc | |
+++ b/components/safe_browsing/core/file_type_policies.cc | |
@@ -49,8 +49,8 @@ FileTypePolicies::~FileTypePolicies() { | |
} | |
std::string FileTypePolicies::ReadResourceBundle() { | |
- ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance(); | |
- return bundle.LoadDataResourceString(IDR_DOWNLOAD_FILE_TYPES_PB); | |
+ //ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance(); | |
+ return nullptr; // bundle.LoadDataResourceString(IDR_DOWNLOAD_FILE_TYPES_PB); | |
} | |
void FileTypePolicies::RecordUpdateMetrics(UpdateResult result, |
yes, I know, they were proof.
a tip on how to easily edit? do I work directly on the .patch files and then redo a new build (which takes me 4 hours)? or is there a simpler method?
I suggest creating multiple commits, then you do a rebase to update the commits from Bromite and use git format-patch
to save them.
Even if you do not finish the build you can create a PR so that we can discuss there instead of bromite/bromite#757 and here.
To speed-up the builds: I will share the small program I use to do restore modification time of the files.
I was trying as you say .. wow it's very difficult!
give me half an hour that I do the pr
@uazo I will open a PR using this gist of yours and my change for the safe browsing fix
you can see my wip in https://github.com/uazo/bromite/tree/v87
Ok, then I let you continue. To avoid this problem every time you make a change you should make a commit for the corresponding patch commit, then in the end you rebase and mark the fixes as fixup.
@uazo I see a lot of commented code blocks, please remove them directly.