Skip to content
Snippets Groups Projects
Commit de52df3d authored by Jim Chen's avatar Jim Chen
Browse files

Bug 1291385 - 2 .Move restrictions package from geckoview to Fennec; r=nalexander

The restrictions package really belongs in Fennec code rather than in
geckoview code. The move also eliminates some dependency errors because
the restrictions package references some classes in Fennec code.

--HG--
rename : mobile/android/geckoview/src/main/java/org/mozilla/gecko/restrictions/DefaultConfiguration.java => mobile/android/base/java/org/mozilla/gecko/restrictions/DefaultConfiguration.java
rename : mobile/android/geckoview/src/main/java/org/mozilla/gecko/restrictions/GuestProfileConfiguration.java => mobile/android/base/java/org/mozilla/gecko/restrictions/GuestProfileConfiguration.java
rename : mobile/android/geckoview/src/main/java/org/mozilla/gecko/restrictions/Restrictable.java => mobile/android/base/java/org/mozilla/gecko/restrictions/Restrictable.java
rename : mobile/android/geckoview/src/main/java/org/mozilla/gecko/restrictions/RestrictedProfileConfiguration.java => mobile/android/base/java/org/mozilla/gecko/restrictions/RestrictedProfileConfiguration.java
rename : mobile/android/geckoview/src/main/java/org/mozilla/gecko/restrictions/RestrictionCache.java => mobile/android/base/java/org/mozilla/gecko/restrictions/RestrictionCache.java
rename : mobile/android/geckoview/src/main/java/org/mozilla/gecko/restrictions/RestrictionConfiguration.java => mobile/android/base/java/org/mozilla/gecko/restrictions/RestrictionConfiguration.java
rename : mobile/android/geckoview/src/main/java/org/mozilla/gecko/restrictions/RestrictionProvider.java => mobile/android/base/java/org/mozilla/gecko/restrictions/RestrictionProvider.java
rename : mobile/android/geckoview/src/main/java/org/mozilla/gecko/restrictions/Restrictions.java => mobile/android/base/java/org/mozilla/gecko/restrictions/Restrictions.java
parent fa1430b7
No related branches found
No related tags found
No related merge requests found
Showing with 8 additions and 14 deletions
......@@ -15,12 +15,6 @@ import org.mozilla.gecko.GeckoAppShell;
import org.mozilla.gecko.GeckoProfile;
import org.mozilla.gecko.annotation.RobocopTarget;
import org.mozilla.gecko.annotation.WrapForJNI;
import org.mozilla.gecko.restrictions.DefaultConfiguration;
import org.mozilla.gecko.restrictions.GuestProfileConfiguration;
import org.mozilla.gecko.restrictions.Restrictable;
import org.mozilla.gecko.restrictions.RestrictedProfileConfiguration;
import org.mozilla.gecko.restrictions.RestrictionCache;
import org.mozilla.gecko.restrictions.RestrictionConfiguration;
@RobocopTarget
public class Restrictions {
......
......@@ -276,14 +276,6 @@ geckoview_java_files = [
'permissions/Permissions.java',
'permissions/PermissionsHelper.java',
'PrefsHelper.java',
'restrictions/DefaultConfiguration.java',
'restrictions/GuestProfileConfiguration.java',
'restrictions/Restrictable.java',
'restrictions/RestrictedProfileConfiguration.java',
'restrictions/RestrictionCache.java',
'restrictions/RestrictionConfiguration.java',
'restrictions/RestrictionProvider.java',
'restrictions/Restrictions.java',
'SmsManager.java',
'sqlite/ByteBufferInputStream.java',
'sqlite/MatrixBlobCursor.java',
......@@ -617,6 +609,14 @@ gbjar.sources += ['java/org/mozilla/gecko/' + x for x in [
'reader/SavedReaderViewHelper.java',
'RemoteClientsDialogFragment.java',
'Restarter.java',
'restrictions/DefaultConfiguration.java',
'restrictions/GuestProfileConfiguration.java',
'restrictions/Restrictable.java',
'restrictions/RestrictedProfileConfiguration.java',
'restrictions/RestrictionCache.java',
'restrictions/RestrictionConfiguration.java',
'restrictions/RestrictionProvider.java',
'restrictions/Restrictions.java',
'ScreenshotObserver.java',
'search/SearchEngine.java',
'search/SearchEngineManager.java',
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment