Converts Main into redux component

Resolves #9452 Auditors: @bbondy @bridiver @bsclifton Test Plan:
brave · Jun 24, 2017 · b36cd12 · b36cd12
1 parent 4f4a0b9
commit b36cd12
Show file tree

Hide file tree

Showing 12 changed files with 252 additions and 223 deletions.
diff --git a/app/browser/menu.js b/app/browser/menu.js
@@ -619,7 +619,7 @@ const doAction = (action) => {
   switch (action.actionType) {
     case windowConstants.WINDOW_SET_FOCUSED_FRAME:
       // Update the checkbox next to "Bookmark Page" (Bookmarks menu)
-      currentLocation = action.frameProps.get('location')
+      currentLocation = action.location
       setMenuItemChecked(locale.translation('bookmarkPage'), isCurrentLocationBookmarked())
       break
     case appConstants.APP_CHANGE_SETTING:

diff --git a/app/renderer/components/frame/frame.js b/app/renderer/components/frame/frame.js
@@ -203,9 +203,9 @@ class Frame extends React.Component {
     }
   }
 
-  onPropsChanged (prevProps = {}) {
+  onPropsChanged () {
     if (this.props.isActive && isFocused()) {
-      windowActions.setFocusedFrame(this.frame)
+      windowActions.setFocusedFrame(this.props.location, this.props.tabId)
     }
   }
 
@@ -270,7 +270,7 @@ class Frame extends React.Component {
     this.lastFrame = this.frame.delete('lastAccessedTime')
 
     const cb = (prevProps = {}) => {
-      this.onPropsChanged(prevProps)
+      this.onPropsChanged()
       if (this.props.isActive && !prevProps.isActive && !this.props.urlBarFocused) {
         this.webview.focus()
       }
@@ -469,7 +469,7 @@ class Frame extends React.Component {
         return
       }
       if (e.details[0] === 'javascript' && e.details[1]) {
-        windowActions.setBlockedBy(this.frame, 'noScript', e.details[1])
+        windowActions.setBlockedBy(this.props.frameKey, 'noScript', e.details[1])
       }
       if (e.details[0] === 'autoplay') {
         appActions.autoplayBlocked(this.props.tabId)
@@ -550,7 +550,7 @@ class Frame extends React.Component {
           }
           method = (detail) => {
             const description = [detail.type, detail.scriptUrl || this.props.provisionalLocation].join(': ')
-            windowActions.setBlockedBy(this.frame, 'fingerprintingProtection', description)
+            windowActions.setBlockedBy(this.props.frameKey, 'fingerprintingProtection', description)
           }
           break
         case messages.THEME_COLOR_COMPUTED:
@@ -648,7 +648,7 @@ class Frame extends React.Component {
 
       if (url.startsWith(pdfjsOrigin)) {
         let displayLocation = UrlUtil.getLocationIfPDF(url)
-        windowActions.setSecurityState(this.frame, {
+        windowActions.setSecurityState(this.props.frameKey, {
           secure: urlParse(displayLocation).protocol === 'https:',
           runInsecureContent: false
         })
@@ -714,7 +714,7 @@ class Frame extends React.Component {
         // connection.
         isSecure = 1
       }
-      windowActions.setSecurityState(this.frame, {
+      windowActions.setSecurityState(this.props.frameKey, {
         secure: runInsecureContent ? false : isSecure,
         runInsecureContent
       })
@@ -786,15 +786,15 @@ class Frame extends React.Component {
       if (this.frame.isEmpty()) {
         return
       }
-      windowActions.setFullScreen(this.frame, true, true)
+      windowActions.setFullScreen(this.props.frameKey, true, true)
       // disable the fullscreen warning after 5 seconds
-      setTimeout(windowActions.setFullScreen.bind(this, this.frame, undefined, false), 5000)
+      setTimeout(windowActions.setFullScreen.bind(this, this.props.frameKey, undefined, false), 5000)
     })
     this.webview.addEventListener('leave-html-full-screen', () => {
       if (this.frame.isEmpty()) {
         return
       }
-      windowActions.setFullScreen(this.frame, false)
+      windowActions.setFullScreen(this.props.frameKey, false)
     })
     this.webview.addEventListener('media-started-playing', ({title}) => {
       if (this.frame.isEmpty()) {