OLD | NEW |
1 /* -*- Mode: Java; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil; -*- | 1 /* -*- Mode: Java; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil; -*- |
2 * This Source Code Form is subject to the terms of the Mozilla Public | 2 * This Source Code Form is subject to the terms of the Mozilla Public |
3 * License, v. 2.0. If a copy of the MPL was not distributed with this | 3 * License, v. 2.0. If a copy of the MPL was not distributed with this |
4 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ | 4 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ |
5 | 5 |
6 package org.mozilla.gecko; | 6 package org.mozilla.gecko; |
7 | 7 |
8 import org.mozilla.gecko.adjust.AdjustHelperInterface; | 8 import org.mozilla.gecko.adjust.AdjustHelperInterface; |
9 import org.mozilla.gecko.annotation.RobocopTarget; | 9 import org.mozilla.gecko.annotation.RobocopTarget; |
10 import org.mozilla.gecko.AdjustConstants; | 10 import org.mozilla.gecko.AdjustConstants; |
(...skipping 1836 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1847 public void addTab() { | 1847 public void addTab() { |
1848 Tabs.getInstance().addTab(); | 1848 Tabs.getInstance().addTab(); |
1849 } | 1849 } |
1850 | 1850 |
1851 @Override | 1851 @Override |
1852 public void addPrivateTab() { | 1852 public void addPrivateTab() { |
1853 Tabs.getInstance().addPrivateTab(); | 1853 Tabs.getInstance().addPrivateTab(); |
1854 } | 1854 } |
1855 | 1855 |
1856 public void showTrackingProtectionPromptIfApplicable() { | 1856 public void showTrackingProtectionPromptIfApplicable() { |
| 1857 // We don't want to show the tracking protection prompt |
| 1858 // See https://issues.adblockplus.org/ticket/5194 |
| 1859 if (true) { |
| 1860 return; |
| 1861 } |
| 1862 |
1857 final SharedPreferences prefs = getSharedPreferences(); | 1863 final SharedPreferences prefs = getSharedPreferences(); |
1858 | 1864 |
1859 final boolean hasTrackingProtectionPromptBeShownBefore = prefs.getBoolea
n(GeckoPreferences.PREFS_TRACKING_PROTECTION_PROMPT_SHOWN, false); | 1865 final boolean hasTrackingProtectionPromptBeShownBefore = prefs.getBoolea
n(GeckoPreferences.PREFS_TRACKING_PROTECTION_PROMPT_SHOWN, false); |
1860 | 1866 |
1861 if (hasTrackingProtectionPromptBeShownBefore) { | 1867 if (hasTrackingProtectionPromptBeShownBefore) { |
1862 return; | 1868 return; |
1863 } | 1869 } |
1864 | 1870 |
1865 prefs.edit().putBoolean(GeckoPreferences.PREFS_TRACKING_PROTECTION_PROMP
T_SHOWN, true).apply(); | 1871 prefs.edit().putBoolean(GeckoPreferences.PREFS_TRACKING_PROTECTION_PROMP
T_SHOWN, true).apply(); |
1866 | 1872 |
(...skipping 1938 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3805 final boolean inGuestMode = GeckoProfile.get(this).inGuestMode(); | 3811 final boolean inGuestMode = GeckoProfile.get(this).inGuestMode(); |
3806 if (inGuestMode) { | 3812 if (inGuestMode) { |
3807 return StartupAction.GUEST; | 3813 return StartupAction.GUEST; |
3808 } | 3814 } |
3809 if (RestrictedProfiles.isRestrictedProfile(this)) { | 3815 if (RestrictedProfiles.isRestrictedProfile(this)) { |
3810 return StartupAction.RESTRICTED; | 3816 return StartupAction.RESTRICTED; |
3811 } | 3817 } |
3812 return (passedURL == null ? StartupAction.NORMAL : StartupAction.URL); | 3818 return (passedURL == null ? StartupAction.NORMAL : StartupAction.URL); |
3813 } | 3819 } |
3814 } | 3820 } |
OLD | NEW |