Address feedbacks

- Remove bookmarked from bookmarkButton.js
- Remove activeFrame from bookmarkButton.js
- Remove prop.activeFrameKey from bookmarkButton.js
- Remove prop.sites from bookmarkButton.js
- Revert loadTimer split
- Revert legend split

app/renderer/components/navigation/buttons/bookmarkButton.js

@@ -21,9 +21,6 @@ const messages = require('../../../../../js/constants/messages')
 const tabState = require('../../../../common/state/tabState')
 const frameStateUtil = require('../../../../../js/state/frameStateUtil')
 
-// Store
-const windowStore = require('../../../../../js/stores/windowStore')
-
 // Utils
 const siteUtil = require('../../../../../js/state/siteUtil')
 const UrlUtil = require('../../../../../js/lib/urlutil')
@@ -39,14 +36,6 @@ class BookmarkButton extends React.Component {
     this.onToggleBookmark = this.onToggleBookmark.bind(this)
   }
 
-  get bookmarked () {
-    return this.props.activeFrameKey !== undefined && this.props.bookmarked
-  }
-
-  get activeFrame () {
-    return windowStore.getFrame(this.props.activeFrameKey)
-  }
-
   onToggleBookmark () {
     const editing = this.bookmarked
     // show the AddEditBookmarkHanger control; saving/deleting takes place there
@@ -76,14 +65,11 @@ class BookmarkButton extends React.Component {
   mergeProps (state, dispatchProps, ownProps) {
     const currentWindow = state.get('currentWindow')
     const activeFrame = frameStateUtil.getActiveFrame(currentWindow) || Immutable.Map()
-    const activeFrameKey = activeFrame.get('key')
     const activeTabId = activeFrame.get('tabId', tabState.TAB_ID_NONE)
     const activeTab = tabState.getByTabId(state, activeTabId)
 
     const props = {}
-    props.activeFrameKey = activeFrameKey
     props.bookmarked = activeTab && activeTab.get('bookmarked')
-    props.sites = state.get('sites')
 
     return props
   }

app/renderer/components/navigation/urlBar.js

@@ -421,15 +421,6 @@ class UrlBar extends React.Component {
     </div>
   }
 
-  // BEM Level: urlbarForm__titleBar__loadTime
-  get loadTimer () {
-    return <span className={css(
-      styles.loadTime,
-      this.props.isActive && styles.loadTime_onFocus
-    )}
-      data-test-id='loadTime'>{this.loadTime}</span>
-  }
-
   // BEM Level: urlbarForm__input
   get input () {
     return <input type='text'
@@ -454,15 +445,6 @@ class UrlBar extends React.Component {
     />
   }
 
-  // BEM Level: urlbarForm__legend
-  get legend () {
-    return <legend className={css(
-      styles.legend,
-      !!this.props.isFocused && styles.legend_isFocused,
-      this.props.publisherButtonVisible && styles.legend_urlBarEnd
-    )} />
-  }
-
   // BEM Level: urlbarForm__buttonContainer_showNoScript
   get noScriptInfo () {
     return <NavigationBarButtonContainer isSquare>
@@ -582,11 +564,19 @@ class UrlBar extends React.Component {
       {
         this.props.titleMode
         ? null
-        : this.legend
+        : <legend className={css(
+          styles.urlbarForm__legend,
+          !!this.props.isFocused && styles.urlbarForm__legend_isFocused,
+          this.props.publisherButtonVisible && styles.urlbarForm__legend_urlBarEnd
+        )} />
       }
       {
         this.props.showDisplayTime
-        ? this.loadTimer
+        ? <span className={css(
+          styles.urlbarForm__loadTime,
+          this.props.isActive && styles.urlbarForm__loadTime_onFocus
+        )}
+          data-test-id='loadTime'>{this.loadTime}</span>
         : null
       }
       {
@@ -654,6 +644,44 @@ const styles = StyleSheet.create({
     borderBottomRightRadius: 0
   },
 
+  urlbarForm__legend: {
+    ':before': {
+      display: 'none',
+      content: '" "',
+      position: 'absolute',
+      borderRadius: '0 4px 4px 0',
+      color: '#333',
+      boxShadow: `inset 0 0 0 1px ${globalStyles.color.urlBarOutline}, inset 0 0 0 3px ${globalStyles.color.focusUrlbarOutline}`,
+      outline: 'none',
+      top: 0,
+      bottom: 0,
+      right: 0,
+      left: 0,
+      zIndex: globalStyles.zindex.zindexNavigationBar
+    }
+  },
+
+  urlbarForm__legend_isFocused: {
+    ':before': {
+      display: 'block'
+    }
+  },
+
+  urlbarForm__legend_urlBarEnd: {
+    ':before': {
+      borderRadius: 0
+    }
+  },
+
+  urlbarForm__loadTime: {
+    color: globalStyles.color.loadTimeColor,
+    fontSize: '12px'
+  },
+
+  urlbarForm__loadTime_onFocus: {
+    display: 'none'
+  },
+
   titleBar: {
     display: 'inline-block',
     color: globalStyles.color.chromeText,
@@ -697,44 +725,6 @@ const styles = StyleSheet.create({
     width: '100%'
   },
 
-  legend: {
-    ':before': {
-      display: 'none',
-      content: '" "',
-      position: 'absolute',
-      borderRadius: '0 4px 4px 0',
-      color: '#333',
-      boxShadow: `inset 0 0 0 1px ${globalStyles.color.urlBarOutline}, inset 0 0 0 3px ${globalStyles.color.focusUrlbarOutline}`,
-      outline: 'none',
-      top: 0,
-      bottom: 0,
-      right: 0,
-      left: 0,
-      zIndex: globalStyles.zindex.zindexNavigationBar
-    }
-  },
-
-  legend_isFocused: {
-    ':before': {
-      display: 'block'
-    }
-  },
-
-  legend_urlBarEnd: {
-    ':before': {
-      borderRadius: 0
-    }
-  },
-
-  loadTime: {
-    color: globalStyles.color.loadTimeColor,
-    fontSize: '12px'
-  },
-
-  loadTime_onFocus: {
-    display: 'none'
-  },
-
   noScript__button: {
     background: `url(${iconNoScript}) center no-repeat`,
     width: '15px',