diff --git a/brightray/brightray.gyp b/brightray/brightray.gyp
index 42e087711fd..55b597bdac8 100644
--- a/brightray/brightray.gyp
+++ b/brightray/brightray.gyp
@@ -44,11 +44,12 @@
               '-Wl,--no-whole-archive',
             ],
           }
-        }, {
+        }, {  # (Release build on Linux)
           'link_settings': {
             'libraries': [ '<@(libchromiumcontent_libraries)' ]
           },
-        }],
+        }],  # (Normal builds)
+        # Linux specific link settings.
         ['OS=="linux"', {
           'link_settings': {
             'ldflags': [
@@ -96,99 +97,107 @@
               },
             }],
           ],
-        }],
+        }],  # OS=="linux"
         ['OS=="mac"', {
           'link_settings': {
             'libraries': [
               '$(SDKROOT)/System/Library/Frameworks/AppKit.framework',
             ],
           },
-        }],
-        ['OS=="mac" and libchromiumcontent_component==0', {
-          'link_settings': {
-            'libraries': [
-              # ui_base.gypi:
-              '$(SDKROOT)/System/Library/Frameworks/Accelerate.framework',
-              # net.gypi:
-              '$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
-              '$(SDKROOT)/System/Library/Frameworks/Security.framework',
-              '$(SDKROOT)/System/Library/Frameworks/SystemConfiguration.framework',
-              '$(SDKROOT)/usr/lib/libresolv.dylib',
-              # media.gyp:
-              '$(SDKROOT)/System/Library/Frameworks/AudioToolbox.framework',
-              '$(SDKROOT)/System/Library/Frameworks/AudioUnit.framework',
-              '$(SDKROOT)/System/Library/Frameworks/CoreAudio.framework',
-              '$(SDKROOT)/System/Library/Frameworks/CoreMIDI.framework',
-              '$(SDKROOT)/System/Library/Frameworks/CoreVideo.framework',
-              '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework',
-              '$(SDKROOT)/System/Library/Frameworks/QTKit.framework',
-              # surface.gyp:
-              '$(SDKROOT)/System/Library/Frameworks/IOSurface.framework',
-              # content_common.gypi:
-              '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework',
-              # base.gyp:
-              '$(SDKROOT)/System/Library/Frameworks/ApplicationServices.framework',
-              '$(SDKROOT)/System/Library/Frameworks/Carbon.framework',
-              '$(SDKROOT)/System/Library/Frameworks/CoreFoundation.framework',
-              '$(SDKROOT)/System/Library/Frameworks/IOKit.framework',
-              # content_browser.gypi:
-              '$(SDKROOT)/usr/lib/libbsm.dylib',
-            ],
-          },
-        }],
-        ['OS=="win" and libchromiumcontent_component==1', {
-          'link_settings': {
-            'libraries': [
-              '<(libchromiumcontent_dir)/base_static.lib',
-              '<(libchromiumcontent_dir)/sandbox.lib',
-            ],
-          },
-        }],
-        ['OS=="win" and libchromiumcontent_component==0', {
-          'link_settings': {
-            'libraries': [
-              '<(libchromiumcontent_dir)/ffmpegsumo.lib',
-              '<(libchromiumcontent_dir)/libyuv.lib',
-              # content_browser.gypi:
-              '-lsensorsapi.lib',
-              '-lportabledeviceguids.lib',
-              # content_common.gypi:
-              '-ld3d9.lib',
-              '-ldxva2.lib',
-              '-lstrmiids.lib',
-              '-lmf.lib',
-              '-lmfplat.lib',
-              '-lmfuuid.lib',
-              # media.gyp:
-              '-lmfreadwrite.lib',
-            ],
-            'msvs_settings': {
-              'VCLinkerTool': {
-                'AdditionalDependencies': [
-                  'advapi32.lib',
-                  'dbghelp.lib',
-                  'dwmapi.lib',
-                  'gdi32.lib',
-                  'netapi32.lib',
-                  'oleacc.lib',
-                  'powrprof.lib',
-                  'user32.lib',
-                  'usp10.lib',
-                  'version.lib',
-                  'winspool.lib',
-                ],
-                'DelayLoadDLLs': [
-                  'ffmpegsumo.dll',
+          'conditions':  [
+            # Link with system frameworks.
+            ['libchromiumcontent_component==0', {
+              'link_settings': {
+                'libraries': [
+                  # ui_base.gypi:
+                  '$(SDKROOT)/System/Library/Frameworks/Accelerate.framework',
+                  # net.gypi:
+                  '$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
+                  '$(SDKROOT)/System/Library/Frameworks/Security.framework',
+                  '$(SDKROOT)/System/Library/Frameworks/SystemConfiguration.framework',
+                  '$(SDKROOT)/usr/lib/libresolv.dylib',
+                  # media.gyp:
+                  '$(SDKROOT)/System/Library/Frameworks/AudioToolbox.framework',
+                  '$(SDKROOT)/System/Library/Frameworks/AudioUnit.framework',
+                  '$(SDKROOT)/System/Library/Frameworks/CoreAudio.framework',
+                  '$(SDKROOT)/System/Library/Frameworks/CoreMIDI.framework',
+                  '$(SDKROOT)/System/Library/Frameworks/CoreVideo.framework',
+                  '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework',
+                  '$(SDKROOT)/System/Library/Frameworks/QTKit.framework',
+                  # surface.gyp:
+                  '$(SDKROOT)/System/Library/Frameworks/IOSurface.framework',
                   # content_common.gypi:
-                  'd3d9.dll',
-                  'dxva2.dll',
-                  'mf.dll',
-                  'mfplat.dll',
+                  '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework',
+                  # base.gyp:
+                  '$(SDKROOT)/System/Library/Frameworks/ApplicationServices.framework',
+                  '$(SDKROOT)/System/Library/Frameworks/Carbon.framework',
+                  '$(SDKROOT)/System/Library/Frameworks/CoreFoundation.framework',
+                  '$(SDKROOT)/System/Library/Frameworks/IOKit.framework',
+                  # content_browser.gypi:
+                  '$(SDKROOT)/usr/lib/libbsm.dylib',
                 ],
               },
-            },
-          },
-        }],
+            }],
+          ]
+        }],  # OS=="mac"
+        ['OS=="win"', {
+          'conditions': [
+            ['libchromiumcontent_component', {
+              # sandbox and base_static are always linked statically.
+              'link_settings': {
+                'libraries': [
+                  '<(libchromiumcontent_dir)/base_static.lib',
+                  '<(libchromiumcontent_dir)/sandbox.lib',
+                ],
+              },
+            }, {
+              # Link with system libraries.
+              'link_settings': {
+                'libraries': [
+                  # ffmpegsumo.lib is required for linking with ffmpegsumo.dll
+                  '<(libchromiumcontent_dir)/ffmpegsumo.lib',
+                  # content_browser.gypi:
+                  '-lsensorsapi.lib',
+                  '-lportabledeviceguids.lib',
+                  # content_common.gypi:
+                  '-ld3d9.lib',
+                  '-ldxva2.lib',
+                  '-lstrmiids.lib',
+                  '-lmf.lib',
+                  '-lmfplat.lib',
+                  '-lmfuuid.lib',
+                  # media.gyp:
+                  '-lmfreadwrite.lib',
+                ],
+                'msvs_settings': {
+                  'VCLinkerTool': {
+                    'AdditionalDependencies': [
+                      'advapi32.lib',
+                      'dbghelp.lib',
+                      'dwmapi.lib',
+                      'gdi32.lib',
+                      'netapi32.lib',
+                      'oleacc.lib',
+                      'powrprof.lib',
+                      'user32.lib',
+                      'usp10.lib',
+                      'version.lib',
+                      'winspool.lib',
+                    ],
+                    'DelayLoadDLLs': [
+                      'ffmpegsumo.dll',
+                      # content_common.gypi:
+                      'd3d9.dll',
+                      'dxva2.dll',
+                      'mf.dll',
+                      'mfplat.dll',
+                    ],
+                  },
+                },
+              },
+            }],  # libchromiumcontent_component
+          ],
+        }],  # OS=="win"
       ],
     },
   ],