Fixed initial rendering of toolbar.

ceee/ie/plugin/toolband/tool_band.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 toolband implementation.
 #ifndef CEEE_IE_PLUGIN_TOOLBAND_TOOL_BAND_H_
 #define CEEE_IE_PLUGIN_TOOLBAND_TOOL_BAND_H_
 
 #include <atlbase.h>
 #include <atlapp.h>  // Must be included AFTER base.
@@ skipping 37 matching lines @@
     public IChromeFramePrivileged,
     public IDeskBand,
     public IPersistStream,
     public ChromeFrameEvents,
     public HostingBrowserEvents,
     public CWindowImpl<ToolBand> {
  public:
   ToolBand();
   ~ToolBand();
 
+  DECLARE_WND_SUPERCLASS(NULL, TOOLBARCLASSNAME)

[Sigurður Ásgeirsson, 2011/01/13 14:42:55]

Why do we want this class name? Can you add a quick comment?

[Vitaly Buka (NO REVIEWS), 2011/01/14 00:06:30]

Done.

+
   DECLARE_REGISTRY_RESOURCEID_EX(IDR_TOOL_BAND)
   BEGIN_REGISTRY_MAP(ToolBand)
     REGMAP_UUID("CLSID", CLSID_ToolBand)
     REGMAP_RESOURCE("NAME", IDS_CEEE_NAME)
   END_REGISTRY_MAP()
 
   BEGIN_COM_MAP(ToolBand)
     COM_INTERFACE_ENTRY(IDeskBand)
     COM_INTERFACE_ENTRY(IDockingWindow)
     COM_INTERFACE_ENTRY(IOleWindow)
@@ skipping 104 matching lines @@
   virtual void OnFinalMessage(HWND window);
   LRESULT OnCreate(LPCREATESTRUCT lpCreateStruct);
 
   // Loads the manifest from file and retrieves the URL to the extension.
   // @returns true on success, false on failure to read the manifest or URL.
   bool LoadManifestFile(const std::wstring& base_dir,
                         std::string* toolband_url);
 
   // @name Message handlers.
   // @{
-  void OnPaint(CDCHandle dc);
   void OnSize(UINT type, CSize size);
   // @}
 
   // Toolband requires a specific BHO to work. Normally, IE will create BHO
   // about the same time as the toolband. However, in some scenarios
   // (re-enabling the gadget) BHOs for the current pages won't be created,
   // even though the bar will.
   HRESULT EnsureBhoIsAvailable();
 
   // Gets the session ID of the Chrome Frame instance associated with the tool
   // band.
   virtual HRESULT GetSessionId(int* session_id);
 
   // Sends the tool band's Chrome Frame session ID to the BHO, given the BHO as
   // an IUnknown.
   virtual HRESULT SendSessionIdToBho(IUnknown* bho);
 
  private:
+  class EmptyWindow : public CWindowImpl<EmptyWindow> {
+   public:
+    BEGIN_MSG_MAP(EmptyWindow)
+    END_MSG_MAP()
+  };
+
   // Initializes the toolband to the given site.
   // Called from SetSite.
   HRESULT Initialize(IUnknown *site);
   // Tears down an initialized toolband.
   // Called from SetSite.
   HRESULT Teardown();
 
   // Handles the dispatching of command received from the User/UI context.
   HRESULT DispatchUserCommand(const DictionaryValue& dict,
                               scoped_ptr<Value>* return_value);
@@ skipping 22 matching lines @@
 
   // The minimum size the toolband should take.
   LONG current_width_;
   LONG current_height_;
 
   // The URL to our extension.
   std::string extension_url_;
 
   // Our Chrome frame instance and its window.
   CComPtr<IChromeFrame> chrome_frame_;
-  CWindow chrome_frame_window_;
+
+  // Hides chrome frame during initialization.
+  EmptyWindow chrome_frame_container_window_;
 
   // Indicates whether CloseDW() is being called on this tool band.
   bool is_quitting_;
 
   // True if we noticed that no extensions are enabled and requested
   // to install one.
   bool already_tried_installing_;
 
   // Flag purpose: see comments to ShouldForceOwnLine
   // for efficiency we read only once (thus the second flag).
@@ skipping 18 matching lines @@
   static _ATL_FUNC_INFO handler_type_long_;
   static _ATL_FUNC_INFO handler_type_idispatch_bstr_;
   static _ATL_FUNC_INFO handler_type_bstr_i4_;
   static _ATL_FUNC_INFO handler_type_bstrarray_;
   static _ATL_FUNC_INFO handler_type_idispatch_variantref_;
 
   DISALLOW_COPY_AND_ASSIGN(ToolBand);
 };
 
 #endif  // CEEE_IE_PLUGIN_TOOLBAND_TOOL_BAND_H_