Use BRANDING for IE CEEE. Simplify chrome_dll_version handling.

ceee/ie/plugin/bho/browser_helper_object.h

 // 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.
 //
 // IE browser helper object implementation.
 #ifndef CEEE_IE_PLUGIN_BHO_BROWSER_HELPER_OBJECT_H_
 #define CEEE_IE_PLUGIN_BHO_BROWSER_HELPER_OBJECT_H_
 
 #include <atlbase.h>
 #include <atlcom.h>
@@ skipping 16 matching lines @@
 #include "ceee/ie/plugin/bho/tab_events_funnel.h"
 #include "ceee/ie/common/chrome_frame_host.h"
 #include "ceee/ie/plugin/bho/frame_event_handler.h"
 #include "ceee/ie/plugin/bho/extension_port_manager.h"
 #include "ceee/ie/plugin/bho/tool_band_visibility.h"
 #include "ceee/ie/plugin/bho/web_browser_events_source.h"
 #include "ceee/ie/plugin/bho/web_progress_notifier.h"
 #include "ceee/ie/plugin/scripting/userscripts_librarian.h"
 #include "ceee/ie/plugin/scripting/content_script_native_api.h"
 #include "ceee/ie/plugin/toolband/resource.h"
+
 #include "broker_lib.h"  // NOLINT
 #include "toolband.h"  // NOLINT
 
 // Implementation of an IE browser helper object.
 class ATL_NO_VTABLE BrowserHelperObject
     : public CComObjectRootEx<CComSingleThreadModel>,
       public CComCoClass<BrowserHelperObject, &CLSID_BrowserHelperObject>,
       public IObjectWithSiteImpl<BrowserHelperObject>,
       public IDispEventSimpleImpl<0,
                                   BrowserHelperObject,
                                   &DIID_DWebBrowserEvents2>,
       public IPersistImpl<BrowserHelperObject>,
       public IFrameEventHandlerHost,
       public IExtensionPortMessagingProvider,
       public IChromeFrameHostEvents,
       public ICeeeBho,
       public ToolBandVisibility,
       public WebBrowserEventsSource {
  public:
   DECLARE_REGISTRY_RESOURCEID_EX(IDR_BROWSERHELPEROBJECT)
   BEGIN_REGISTRY_MAP(BrowserHelperObject)
     REGMAP_UUID("CLSID", CLSID_BrowserHelperObject)
-    REGMAP_RESOURCE("NAME", IDS_CEEE_NAME)
+    REGMAP_RESOURCE("NAME", IDS_CEEE_BHO_NAME)
   END_REGISTRY_MAP()
 
   DECLARE_NOT_AGGREGATABLE(BrowserHelperObject)
 
   BEGIN_COM_MAP(BrowserHelperObject)
     COM_INTERFACE_ENTRY(IObjectWithSite)
     COM_INTERFACE_ENTRY(IPersist)
     COM_INTERFACE_ENTRY(ICeeeBho)
     COM_INTERFACE_ENTRY_IID(IID_IFrameEventHandlerHost, IFrameEventHandlerHost)
   END_COM_MAP()
@@ skipping 346 matching lines @@
   // Check if the first parameter belongs to the browser tree rooted at
   // root_browser.
   HRESULT VerifyBrowserInHierarchy(IWebBrowser2* webbrowser,
                                    IWebBrowser2* root_browser);
 
   typedef std::deque<Task*> DeferredCallListType;
   DeferredCallListType deferred_tab_id_call_;
 };
 
 #endif  // CEEE_IE_PLUGIN_BHO_BROWSER_HELPER_OBJECT_H_