Re-add navigationBarWrapper

Addresses #9283

See discussion on #9851 (comment)

app/renderer/components/navigation/navigationBar.js

@@ -30,18 +30,14 @@ const frameStateUtil = require('../../../../js/state/frameStateUtil')
 // Utils
 const cx = require('../../../../js/lib/classSet')
 const {getBaseUrl} = require('../../../../js/lib/appUrlUtil')
-const eventUtil = require('../../../../js/lib/eventUtil')
 const {getSetting} = require('../../../../js/settings')
-const contextMenus = require('../../../../js/contextMenus')
 const bookmarkLocationCache = require('../../../common/cache/bookmarkLocationCache')
 const platformUtil = require('../../../common/lib/platformUtil')
-const {isFullScreen} = require('../../currentWindow')
+const isDarwin = platformUtil.isDarwin()
 
 // Styles
 const globalStyles = require('../styles/global')
 
-const isDarwin = platformUtil.isDarwin()
-
 class NavigationBar extends React.Component {
   mergeProps (state, ownProps) {
     const currentWindow = state.get('currentWindow')

app/renderer/components/navigation/navigator.js

@@ -155,26 +155,6 @@ class Navigator extends React.Component {
     ipc.off(messages.SHORTCUT_ACTIVE_FRAME_FORWARD, this.onForward)
   }
 
-  // BEM Level: navigator__menuBarAndNavigationBar__navigationBarWrapper
-  get navigationBarWrapper () {
-    return <div className={cx({
-      navigationBarWrapper: true,
-      [css(styles.navigationBarWrapper)]: true
-    })}
-      onDoubleClick={this.onDoubleClick}
-      onDragOver={this.onDragOver}
-      onDrop={this.onDrop}
-    >
-      {this.topLevelStartButtons}
-      {
-        this.props.showNavigationBar
-        ? <NavigationBar />
-        : null
-      }
-      {this.topLevelEndButtons}
-    </div>
-  }
-
   // BEM Level: navigator__menuBarAndNavigationBar__navigationBarWrapper__topLevelStartButtons
   get topLevelStartButtons () {
     return <div className={cx({
@@ -403,7 +383,22 @@ class Navigator extends React.Component {
             </div>
             : null
         }
-        {this.navigationBarWrapper}
+        <div className={cx({
+          navigationBarWrapper: true,
+          [css(styles.navigator__menuBarAndNavigationBar__navigationBarWrapper)]: true
+        })}
+          onDoubleClick={this.onDoubleClick}
+          onDragOver={this.onDragOver}
+          onDrop={this.onDrop}
+        >
+          {this.topLevelStartButtons}
+          {
+            this.props.showNavigationBar
+            ? <NavigationBar />
+            : null
+          }
+          {this.topLevelEndButtons}
+        </div>
       </div>
       {
         this.props.isCaptionButton
@@ -425,7 +420,7 @@ const styles = StyleSheet.create({
     whiteSpace: 'nowrap'
   },
 
-  navigationBarWrapper: {
+  navigator__menuBarAndNavigationBar__navigationBarWrapper: {
     boxSizing: 'border-box',
     display: 'flex',
     justifyContent: 'space-between',

app/renderer/components/navigation/urlBar.js

@@ -37,14 +37,15 @@ const {eventElHasAncestorWithClasses, isForSecondaryAction} = require('../../../
 const {getBaseUrl, isUrl} = require('../../../../js/lib/appUrlUtil')
 const {getCurrentWindowId} = require('../../currentWindow')
 const {normalizeLocation, getNormalizedSuggestion} = require('../../../common/lib/suggestion')
-const isDarwin = require('../../../common/lib/platformUtil').isDarwin()
+const platformUtil = require('../../../common/lib/platformUtil')
 const publisherUtil = require('../../../common/lib/publisherUtil')
 const historyUtil = require('../../../common/lib/historyUtil')
-const isWindows = require('../../../common/lib/platformUtil').isWindows()
+
+const isDarwin = platformUtil.isDarwin()
+const isWindows = platformUtil.isWindows()
 
 // Styles
 const iconNoScript = require('../../../../img/url-bar-no-script.svg')
-
 const globalStyles = require('../styles/global')
 
 class UrlBar extends React.Component {