Rebase fixes

MozillaReality · Nov 23, 2018 · 283a0e1 · 283a0e1
1 parent 5075457
commit 283a0e1
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 15 deletions.
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/VRBrowserActivity.java b/app/src/common/shared/org/mozilla/vrbrowser/VRBrowserActivity.java
@@ -47,7 +47,6 @@
 import org.mozilla.vrbrowser.ui.widgets.BookmarkListener;
 import org.mozilla.vrbrowser.ui.widgets.BookmarksWidget;
 import org.mozilla.vrbrowser.ui.widgets.BrowserWidget;
-import org.mozilla.vrbrowser.ui.widgets.dialogs.CrashDialogWidget;
 import org.mozilla.vrbrowser.ui.widgets.KeyboardWidget;
 import org.mozilla.vrbrowser.ui.widgets.NavigationBarWidget;
 import org.mozilla.vrbrowser.ui.widgets.RootWidget;
@@ -59,14 +58,14 @@
 import org.mozilla.vrbrowser.ui.widgets.Widget;
 import org.mozilla.vrbrowser.ui.widgets.WidgetManagerDelegate;
 import org.mozilla.vrbrowser.ui.widgets.WidgetPlacement;
+import org.mozilla.vrbrowser.ui.widgets.dialogs.CrashDialogWidget;
 
 import java.io.IOException;
 import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.LinkedList;
-import java.util.function.Consumer;
 
 import androidx.annotation.Keep;
 import androidx.annotation.NonNull;
@@ -209,8 +208,6 @@ protected void initializeWorld() {
 
         // Bookmarks panel
         mBookmarksWidget = new BookmarksWidget(this);
-        mBookmarksWidget.setBrowserWidget(mBrowserWidget);
-        mBrowserWidget.setBookmarksWidget(mBookmarksWidget);
 
         // Create Browser navigation widget
         mNavigationBar = new NavigationBarWidget(this);

diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/BookmarksWidget.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/BookmarksWidget.java
@@ -48,7 +48,6 @@ public class BookmarksWidget extends UIWidget implements Application.ActivityLif
     private BookmarksBinding mBinding;
     private BookmarkAdapter mBookmarkAdapter;
     private BookmarkListViewModel mBookmarkListModel;
-    private Widget mBrowserWidget;
     private List<BookmarkListener> mBookmarkListeners;
     private AudioEngine mAudio;
     private int mSessionId;
@@ -196,10 +195,6 @@ public void onChanged(List<BookmarkEntity> bookmarkEntities) {
         }
     };
 
-    public void setBrowserWidget(Widget widget) {
-        mBrowserWidget = widget;
-    }
-
     @Override
     public void show() {
         super.show();

diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/BrowserWidget.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/BrowserWidget.java
@@ -45,7 +45,6 @@ public class BrowserWidget extends UIWidget implements SessionStore.SessionChang
     private int mWidthBackup;
     private int mHeightBackup;
     private int mBorderWidth;
-    private BookmarksWidget mBookmarksWidget;
     Runnable mFirstDrawCallback;
 
     public BrowserWidget(Context aContext, int aSessionId) {
@@ -108,10 +107,6 @@ public void hide(@HideFlags int aHideFlag) {
         clearFocus();
     }
 
-    public void setBookmarksWidget(BookmarksWidget aWidget) {
-        mBookmarksWidget = aWidget;
-    }
-
     public void pauseCompositor() {
         if (mDisplay == null) {
             return;
@@ -163,7 +158,6 @@ public void disableVRVideoMode() {
 
     @Override
     public void resizeByMultiplier(float aspect, float multiplier) {
-        mMultiplier = multiplier;
         float worldWidth = WidgetPlacement.floatDimension(getContext(), R.dimen.window_world_width);
         float worldHeight = worldWidth / aspect;
         float area = worldWidth * worldHeight * multiplier;