Revert 71377 - Added loading of nested BHO....

ceee/ie/plugin/toolband/toolband.gyp

 # Copyright (c) 2010 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'includes': [
     '../../../../build/common.gypi',
@@ skipping 38 matching lines @@
         '<(DEPTH)/ceee/ie/broker/broker.gyp:broker_rpc_idl',
         '<(DEPTH)/ceee/ie/broker/broker.gyp:broker_rpc_lib',
         '<(DEPTH)/ceee/ie/common/common.gyp:ie_common_settings',
         '<(DEPTH)/ceee/ie/common/common.gyp:ie_guids',
         '<(DEPTH)/ceee/ie/plugin/bho/bho.gyp:bho',
         '<(DEPTH)/ceee/ie/plugin/scripting/scripting.gyp:scripting',
         '<(DEPTH)/ceee/ie/plugin/scripting/scripting.gyp:javascript_bindings',
         '<(DEPTH)/chrome/chrome.gyp:chrome_version_header',
         '<(DEPTH)/chrome_frame/chrome_frame.gyp:chrome_tab_idl',
       ],
-      'conditions': [
-        [ 'branding == "Chrome"', {
-          'variables': {
-             'brand_specific_resources':
-                 '../../../internal/toolband/brand_specific_resources.rc',
-          },
-        }, { # else branding != "Chrome"
-          'variables': {
-             'brand_specific_resources': 'brand_specific_resources.rc',
-          },
-        }],
-      ],
       'sources': [
         'resource.h',
         'tool_band.rgs',
         'toolband.def',
         'toolband.rc',
         'toolband_module.cc',
         '../bho/browser_helper_object.rgs',
         '../executor.rgs',
         '../scripting/content_script_manager.rc',
-        '<(brand_specific_resources)',
       ],
       'libraries': [
         'iepmapi.lib',
         'oleacc.lib',
         'rpcrt4.lib',
       ],
       'include_dirs': [
         # Allows us to include .tlb and .h files generated
         # from our .idl without undue trouble
         '$(IntDir)',
@@ skipping 65 matching lines @@
         # This define adds ToolbandProxy as a prefix to the generated
         # proxy/stub entrypoint routine names.
         'ENTRY_PREFIX=ToolbandProxy',
         # The proxy stub code defines _purecall, which conflicts with our
         # CRT, so we neuter this here.
         '_purecall=ToolbandPureCall',
       ],
     },
   ]
 }