@@ -3,14 +3,13 @@ Date: Sat, 7 Sep 2019 15:07:42 +0200
33Subject: Add option to not persist tabs across sessions
44
55---
6- chrome/android/java/res/values/values.xml | 3 ++
7- chrome/android/java/res/xml/privacy_preferences.xml | 5 ++++
8- chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java | 4 ++-
9- chrome/android/java/src/org/chromium/chrome/browser/settings/privacy/PrivacyPreferences .java | 12 ++++++++++
10- chrome/browser/ui/android/strings/android_chrome_strings.grd | 6 +++++
6+ chrome/android/java/res/values/values.xml | 3 ++
7+ chrome/android/java/res/xml/privacy_preferences.xml | 5 ++++
8+ chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java | 4 ++-
9+ chrome/android/java/src/org/chromium/chrome/browser/settings/privacy/PrivacySettings .java | 12 ++++++++++
10+ chrome/browser/ui/android/strings/android_chrome_strings.grd | 6 +++++
1111 5 files changed, 29 insertions(+), 1 deletion(-)
1212
13- diff --git a/chrome/android/java/res/values/values.xml b/chrome/android/java/res/values/values.xml
1413--- a/chrome/android/java/res/values/values.xml
1514+++ b/chrome/android/java/res/values/values.xml
1615@@ -57,6 +57,9 @@
@@ -23,25 +22,23 @@ diff --git a/chrome/android/java/res/values/values.xml b/chrome/android/java/res
2322 <!-- Our manage space activity. Default pre-KitKat to be nothing. -->
2423 <string name="manage_space_activity"></string>
2524
26- diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
2725--- a/chrome/android/java/res/xml/privacy_preferences.xml
2826+++ b/chrome/android/java/res/xml/privacy_preferences.xml
29- @@ -15 ,6 +15 ,11 @@
30- android:title="@string/preload_pages_title "
31- android:summary="@string/preload_pages_summary "
32- android:persistent="false " />
27+ @@ -23 ,6 +23 ,11 @@
28+ android:fragment="org.chromium.chrome.browser.settings.privacy.DoNotTrackSettings "
29+ android:key="do_not_track "
30+ android:title="@string/do_not_track_title " />
3331+ <org.chromium.chrome.browser.settings.ChromeBaseCheckBoxPreference
3432+ android:key="close_tabs_on_exit"
3533+ android:title="@string/close_tabs_on_exit_title"
3634+ android:summary="@string/close_tabs_on_exit_summary"
3735+ android:defaultValue="false" />
38- <org.chromium.chrome.browser.settings.ChromeBasePreference
39- android:key="usage_stats_reporting"
40- android:title="@string/usage_stats_setting_title"
41- diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
36+ <Preference
37+ android:key="clear_browsing_data"
38+ android:title="@string/clear_browsing_data_title"
4239--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
4340+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
44- @@ -1143 ,8 +1143 ,10 @@ public class ChromeTabbedActivity extend
41+ @@ -1103 ,8 +1103 ,10 @@ public class ChromeTabbedActivity extend
4542 boolean hadCipherData =
4643 CipherFactory.getInstance().restoreFromBundle(getSavedInstanceState());
4744
@@ -53,9 +50,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
5350 if (noRestoreState) {
5451 // Clear the state files because they are inconsistent and useless from now on.
5552 mTabModelSelectorImpl.clearState();
56- diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/privacy/PrivacyPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/privacy/PrivacyPreferences.java
57- --- a/chrome/android/java/src/org/chromium/chrome/browser/settings/privacy/PrivacyPreferences.java
58- +++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/privacy/PrivacyPreferences.java
53+ --- a/chrome/android/java/src/org/chromium/chrome/browser/settings/privacy/PrivacySettings.java
54+ +++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/privacy/PrivacySettings.java
5955@@ -4,6 +4,7 @@
6056
6157 package org.chromium.chrome.browser.settings.privacy;
@@ -72,15 +68,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/privac
7268 import org.chromium.base.BuildInfo;
7369 import org.chromium.chrome.R;
7470 import org.chromium.chrome.browser.help.HelpAndFeedback;
75- @@ -35,6 +37,7 @@ public class PrivacyPreferences
71+ @@ -35,6 +37,7 @@ public class PrivacySettings
7672 extends PreferenceFragmentCompat implements Preference.OnPreferenceChangeListener {
7773 private static final String PREF_CAN_MAKE_PAYMENT = "can_make_payment";
7874 private static final String PREF_NETWORK_PREDICTIONS = "preload_pages";
7975+ private static final String PREF_CLOSE_TABS_ON_EXIT = "close_tabs_on_exit";
8076 private static final String PREF_USAGE_STATS = "usage_stats_reporting";
8177 private static final String PREF_DO_NOT_TRACK = "do_not_track";
8278 private static final String PREF_SYNC_AND_SERVICES_LINK = "sync_and_services_link";
83- @@ -82,6 +85,10 @@ public class PrivacyPreferences
79+ @@ -82,6 +85,10 @@ public class PrivacySettings
8480 Pref.CAN_MAKE_PAYMENT_ENABLED, (boolean) newValue);
8581 } else if (PREF_NETWORK_PREDICTIONS.equals(key)) {
8682 PrivacyPreferencesManager.getInstance().setNetworkPredictionEnabled((boolean) newValue);
@@ -91,7 +87,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/privac
9187 }
9288
9389 return true;
94- @@ -130,6 +137,11 @@ public class PrivacyPreferences
90+ @@ -130,6 +137,11 @@ public class PrivacySettings
9591 } else {
9692 getPreferenceScreen().removePreference(usageStatsPref);
9793 }
@@ -102,11 +98,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/privac
10298+ closeTabsOnExitPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate);
10399 }
104100 }
105-
106- diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
101+
107102--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
108103+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
109- @@ -3746 ,6 +3746 ,12 @@ The site does NOT gain access to the cam
104+ @@ -3638 ,6 +3638 ,12 @@ Only you can see what your camera is loo
110105 <message name="IDS_CONTEXTMENU_IMAGE_TITLE" desc="The title of a context menu tab when the item pressed contains more than one type. This indicates that all the actions are related to the image.">
111106 IMAGE
112107 </message>
0 commit comments