Fixed initial rendering of toolbar.

ceee/ie/plugin/toolband/tool_band.cc

 // 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.
 #include "ceee/ie/plugin/toolband/tool_band.h"
 
 #include <atlsafe.h>
 #include <atlstr.h>
 #include <shlguid.h>
@@ skipping 312 matching lines @@
     HRESULT hr = host.QueryHost(host_with_site.Receive());
     if (SUCCEEDED(hr))
       host_with_site->SetSite(NULL);
 
     DestroyWindow();
   }
 
   if (chrome_frame_) {
     ChromeFrameEvents::DispEventUnadvise(chrome_frame_);
   }
-  chrome_frame_window_ = NULL;
 
   if (web_browser_ && listening_to_browser_events_) {
     HostingBrowserEvents::DispEventUnadvise(web_browser_,
                                             &DIID_DWebBrowserEvents2);
   }
   listening_to_browser_events_ = false;
 
   return S_OK;
 }
 
 void ToolBand::OnFinalMessage(HWND window) {
   GetUnknown()->Release();
 }
 
 LRESULT ToolBand::OnCreate(LPCREATESTRUCT lpCreateStruct) {
   // Grab a self-reference.
   GetUnknown()->AddRef();
 
+  if (NULL == chrome_frame_container_window_.Create(m_hWnd)) {
+    LOG(ERROR) << "Failed to create window. " << com::LogWe();
+    return -1;
+  }
+
   // Create a host window instance.
   base::win::ScopedComPtr<IAxWinHostWindow> host;
   HRESULT hr = CAxHostWindow::CreateInstance(host.Receive());
   if (FAILED(hr)) {
     LOG(ERROR) << "Failed to create ActiveX host window. " << com::LogHr(hr);
     return 1;
   }
 
   // We're the site for the host window, this needs to be in place
   // before we attach ChromeFrame to the ActiveX control window, so
   // as to allow it to probe our service provider.
   hr = SetChildSite(host);
   DCHECK(SUCCEEDED(hr));
 
   // Create the chrome frame instance.
   hr = chrome_frame_.CoCreateInstance(L"ChromeTab.ChromeFrame");
   if (FAILED(hr)) {
     LOG(ERROR) << "Failed to create the Chrome Frame instance. " <<
         com::LogHr(hr);
     return 1;
   }
 
   // And attach it to our window.
-  hr = host->AttachControl(chrome_frame_, m_hWnd);
+  hr = host->AttachControl(chrome_frame_,
+                           chrome_frame_container_window_.m_hWnd);
   if (FAILED(hr)) {
     LOG(ERROR) << "Failed to attach Chrome Frame to the host. " <<
         com::LogHr(hr);
     return 1;
   }
 
-  // Get the GCF window and hide it for now.
-  CComQIPtr<IOleWindow> ole_window(chrome_frame_);
-  DCHECK(ole_window != NULL);
-  if (SUCCEEDED(ole_window->GetWindow(&chrome_frame_window_.m_hWnd))) {
-    // We hide the chrome frame window until onload in order to avoid
-    // seeing the "Aw Snap" that sometimes otherwise occurs during Chrome
-    // initialization.
-    chrome_frame_window_.ShowWindow(SW_HIDE);
-  }
-
   // Hook up the chrome frame event listener.
   hr = ChromeFrameEvents::DispEventAdvise(chrome_frame_);
   if (FAILED(hr)) {
     LOG(ERROR) << "Failed to hook up event sink. " << com::LogHr(hr);
   }
 
   return 0;
 }
 
-void ToolBand::OnPaint(CDCHandle dc) {
-  RECT rc = {};
-  if (GetUpdateRect(&rc, FALSE)) {
-    PAINTSTRUCT ps = {};
-    BeginPaint(&ps);
-
-    BOOL ret = GetClientRect(&rc);
-    DCHECK(ret);
-    CString text;
-    text.Format(L"Google CEEE. No Chrome Frame found. Instance: 0x%p. ID: %d!)",
-                this, band_id_);
-    ::DrawText(ps.hdc, text, -1, &rc, DT_SINGLELINE | DT_BOTTOM | DT_CENTER);
-
-    EndPaint(&ps);
-  }
-}
-
 void ToolBand::OnSize(UINT type, CSize size) {
   LOG(INFO) << "ToolBand::OnSize(" << type << ", "
       << size.cx << "x" << size.cy << ")";
   CWindow chrome_window = ::GetWindow(m_hWnd, GW_CHILD);
   if (!chrome_window) {
     LOG(ERROR) << "Failed to retrieve Chrome Frame window";
     return;
   }
 
   BOOL resized = chrome_window.ResizeClient(size.cx, size.cy);
@@ skipping 149 matching lines @@
       }
     } else {
       LOG(ERROR) << "Failed to obtain OleCommandTarget. Error Code: "
           << com::LogHr(hr);
     }
   }
   directories.Detach();
 }
 
 STDMETHODIMP_(void) ToolBand::OnCfOnload(IDispatch* event) {
-  if (chrome_frame_window_.IsWindow()) {
+  if (chrome_frame_container_window_.IsWindow()) {
     VLOG(1) << "Showing the Chrome Frame window.";
-    chrome_frame_window_.ShowWindow(SW_SHOW);
+    chrome_frame_container_window_.ShowWindow(SW_SHOW);
   }
 }
 
 STDMETHODIMP_(void) ToolBand::OnCfOnloadError(IDispatch* event) {
   // Handle error the same way as OnLoad.
   LOG(ERROR) << "Chrome Frame reports onload error";
   OnCfOnload(event);
 }
 
 STDMETHODIMP_(void) ToolBand::OnIeNavigateComplete2(IDispatch* dispatch,
@@ skipping 159 matching lines @@
     hr = GetSessionId(&session_id);
     if (SUCCEEDED(hr)) {
       hr = ceee_bho->SetToolBandSessionId(session_id);
       if (SUCCEEDED(hr))
         already_sent_id_to_bho_ = true;
       return hr;
     }
   }
   return E_FAIL;
 }