Re-land:

chrome/browser/external_tab_container_win.cc

 // Copyright (c) 2011 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/external_tab_container_win.h"
 
 #include <string>
 
 #include "base/debug/trace_event.h"
 #include "base/i18n/rtl.h"
@@ skipping 69 matching lines @@
   }
  private:
   scoped_refptr<ExternalTabContainer> container_;
 };
 
 base::LazyInstance<ExternalTabContainer::PendingTabs>
     ExternalTabContainer::pending_tabs_(base::LINKER_INITIALIZED);
 
 ExternalTabContainer::ExternalTabContainer(
     AutomationProvider* automation, AutomationResourceMessageFilter* filter)
-    : automation_(automation),
+    : views::WidgetWin(new views::Widget),
+      automation_(automation),
       tab_contents_container_(NULL),
       tab_handle_(0),
       ignore_next_load_notification_(false),
       automation_resource_message_filter_(filter),
       load_requests_via_automation_(false),
       handle_top_level_requests_(false),
       external_method_factory_(this),
       pending_(false),
       infobars_enabled_(true),
       focus_manager_(NULL),
@@ skipping 29 matching lines @@
 
   load_requests_via_automation_ = load_requests_via_automation;
   handle_top_level_requests_ = handle_top_level_requests;
   infobars_enabled_ = infobars_enabled;
   route_all_top_level_navigations_ = route_all_top_level_navigations;
 
   set_window_style(WS_POPUP | WS_CLIPCHILDREN);
 
   views::Widget::InitParams params(views::Widget::InitParams::TYPE_POPUP);
   params.bounds = bounds;
+  params.native_widget = this;
   GetWidget()->Init(params);
   if (!IsWindow()) {
     NOTREACHED();
     return false;
   }
 
   // TODO(jcampan): limit focus traversal to contents.
 
   prop_.reset(new ViewProp(GetNativeView(), kWindowObjectKey, this));
 
@@ skipping 60 matching lines @@
   LoadAccelerators();
   SetupExternalTabView();
   return true;
 }
 
 void ExternalTabContainer::Uninitialize() {
   registrar_.RemoveAll();
   if (tab_contents_.get()) {
     UnregisterRenderViewHost(tab_contents_->render_view_host());
 
-    if (GetRootView()) {
-      GetRootView()->RemoveAllChildViews(true);
-    }
+    if (GetWidget()->GetRootView())
+      GetWidget()->GetRootView()->RemoveAllChildViews(true);
 
     NotificationService::current()->Notify(
         NotificationType::EXTERNAL_TAB_CLOSED,
         Source<NavigationController>(&tab_contents_->controller()),
         Details<ExternalTabContainer>(this));
 
     tab_contents_.reset(NULL);
   }
 
   if (focus_manager_) {
@@ skipping 331 matching lines @@
                                         bool show_history) {
   POINT cursor_pos = {0};
   GetCursorPos(&cursor_pos);
 
   gfx::Rect bounds;
   bounds.set_origin(gfx::Point(cursor_pos));
 
   PageInfoBubbleView* page_info_bubble =
       new ExternalTabPageInfoBubbleView(this, NULL, profile, url,
                                         ssl, show_history);
-  Bubble* bubble = Bubble::Show(this, bounds, BubbleBorder::TOP_LEFT,
+  Bubble* bubble = Bubble::Show(GetWidget(), bounds, BubbleBorder::TOP_LEFT,
                                 page_info_bubble, page_info_bubble);
   page_info_bubble->set_bubble(bubble);
 }
 
 void ExternalTabContainer::RegisterRenderViewHostForAutomation(
     RenderViewHost* render_view_host, bool pending_view) {
   if (render_view_host) {
     AutomationResourceMessageFilter::RegisterRenderView(
         render_view_host->process()->id(),
         render_view_host->routing_id(),
@@ skipping 410 matching lines @@
     // Nothing to do in that case.
     return;
   }
 
   scoped_ptr<ACCEL> scoped_accelerators(new ACCEL[count]);
   ACCEL* accelerators = scoped_accelerators.get();
   DCHECK(accelerators != NULL);
 
   CopyAcceleratorTable(accelerator_table, accelerators, count);
 
-  focus_manager_ = GetFocusManager();
+  focus_manager_ = GetWidget()->GetFocusManager();
   DCHECK(focus_manager_);
 
   // Let's fill our own accelerator table.
   for (int i = 0; i < count; ++i) {
     bool alt_down = (accelerators[i].fVirt & FALT) == FALT;
     bool ctrl_down = (accelerators[i].fVirt & FCONTROL) == FCONTROL;
     bool shift_down = (accelerators[i].fVirt & FSHIFT) == FSHIFT;
     views::Accelerator accelerator(
         static_cast<ui::KeyboardCode>(accelerators[i].key),
         shift_down, ctrl_down, alt_down);
@@ skipping 55 matching lines @@
                      views::GridLayout::USE_PREF,
                      0,
                      0);
 
   external_tab_view_->SetLayoutManager(layout);
 
   layout->StartRow(0, 0);
   layout->AddView(info_bar_container);
   layout->StartRow(1, 0);
   layout->AddView(tab_contents_container_);
-  SetContentsView(external_tab_view_);
+  GetWidget()->SetContentsView(external_tab_view_);
   // Note that SetTabContents must be called after AddChildView is called
   tab_contents_container_->ChangeTabContents(tab_contents());
 }
 
 TemporaryPopupExternalTabContainer::TemporaryPopupExternalTabContainer(
     AutomationProvider* automation,
     AutomationResourceMessageFilter* filter)
     : ExternalTabContainer(automation, filter) {
 }
 
 TemporaryPopupExternalTabContainer::~TemporaryPopupExternalTabContainer() {
   DVLOG(1) << __FUNCTION__;
 }
 
 void TemporaryPopupExternalTabContainer::OpenURLFromTab(
     TabContents* source, const GURL& url, const GURL& referrer,
     WindowOpenDisposition disposition, PageTransition::Type transition) {
   if (!automation_)
     return;
 
   if (disposition == CURRENT_TAB) {
     DCHECK(route_all_top_level_navigations_);
     disposition = NEW_FOREGROUND_TAB;
   }
   ExternalTabContainer::OpenURLFromTab(source, url, referrer, disposition,
                                        transition);
   // support only one navigation for a dummy tab before it is killed.
   ::DestroyWindow(GetNativeView());
 }