ExternalTabContainer should subclass WidgetWin rather than Widget and ATL CWi...

chrome/browser/automation/automation_provider.cc

 // Copyright (c) 2006-2009 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.
 
 #include "chrome/browser/automation/automation_provider.h"
 
 #include "app/message_box_flags.h"
 #include "base/file_version_info.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
@@ skipping 41 matching lines @@
 #include "chrome/browser/automation/ui_controls.h"
 #include "chrome/browser/character_encoding.h"
 #include "chrome/browser/download/save_package.h"
 #include "chrome/browser/external_tab_container.h"
 #include "chrome/browser/login_prompt.h"
 #include "chrome/browser/printing/print_job.h"
 #endif  // defined(OS_WIN)
 
 #if defined(OS_WIN)
 #include "chrome/browser/views/bookmark_bar_view.h"
+#include "views/widget/root_view.h"
 #include "views/widget/widget_win.h"
 #include "views/window/window.h"
 #endif
 
 using base::Time;
 
 class InitialLoadObserver : public NotificationObserver {
  public:
   InitialLoadObserver(size_t tab_count, AutomationProvider* automation)
       : automation_(automation),
@@ skipping 2349 matching lines @@
   *tab_handle = 0;
   *tab_container_window = NULL;
   ExternalTabContainer *external_tab_container =
       new ExternalTabContainer(this);
   Profile* profile = incognito? profile_->GetOffTheRecordProfile() : profile_;
   external_tab_container->Init(profile, parent, dimensions, style);
   TabContents* tab_contents = external_tab_container->tab_contents();
   if (tab_contents) {
     *tab_handle = tab_tracker_->Add(&tab_contents->controller());
     external_tab_container->set_tab_handle(*tab_handle);
-    *tab_container_window = *external_tab_container;
+    *tab_container_window = external_tab_container->GetNativeView();
   } else {
     delete external_tab_container;
   }
 }
 #endif
 
 void AutomationProvider::NavigateInExternalTab(
     int handle, const GURL& url,
     AutomationMsg_NavigationResponseValues* status) {
   *status = AUTOMATION_MSG_NAVIGATION_ERROR;
@@ skipping 534 matching lines @@
         DLOG(WARNING) << "SetParent failed. Error 0x%x" << GetLastError();
     }
   }
 }
 #endif
 
 void AutomationProvider::GetWindowTitle(int handle, string16* text) {
   gfx::NativeWindow window = window_tracker_->GetResource(handle);
   text->assign(platform_util::GetWindowTitle(window));
 }