Rework the way Widget::Init works:

chrome/browser/ui/views/bubble/bubble.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/ui/views/bubble/bubble.h"
 
 #include <vector>
 
 #include "chrome/browser/ui/views/bubble/border_contents.h"
 #include "content/common/notification_service.h"
@@ skipping 51 matching lines @@
 
 #if defined(OS_CHROMEOS)
 // static
 Bubble* Bubble::ShowFocusless(
     views::Widget* parent,
     const gfx::Rect& position_relative_to,
     BubbleBorder::ArrowLocation arrow_location,
     views::View* contents,
     BubbleDelegate* delegate,
     bool show_while_screen_is_locked) {
-  Bubble* bubble = new Bubble(views::WidgetGtk::TYPE_POPUP,
+  Bubble* bubble = new Bubble(views::Widget::CreateParams::TYPE_POPUP,
                               show_while_screen_is_locked);
   bubble->InitBubble(parent, position_relative_to, arrow_location,
                      contents, delegate);
   return bubble;
 }
 #endif
 
 void Bubble::Close() {
   if (show_status_ != kOpen)
     return;
@@ skipping 32 matching lines @@
   border_->SetOpacity(opacity);
   border_->border_contents()->SchedulePaint();
 #else
   NOTIMPLEMENTED();
 #endif
 }
 
 Bubble::Bubble()
     :
 #if defined(OS_LINUX)
-      WidgetGtk(TYPE_WINDOW),
       border_contents_(NULL),
 #elif defined(OS_WIN)
       border_(NULL),
 #endif
       delegate_(NULL),
       show_status_(kOpen),
       fade_away_on_close_(false),
 #if defined(OS_CHROMEOS)
+      type_(views::Widget::CreateParams::TYPE_WINDOW),
       show_while_screen_is_locked_(false),
 #endif
       arrow_location_(BubbleBorder::NONE),
       contents_(NULL) {
 }
 
 #if defined(OS_CHROMEOS)
-Bubble::Bubble(views::WidgetGtk::Type type, bool show_while_screen_is_locked)
-    : WidgetGtk(type),
-      border_contents_(NULL),
+Bubble::Bubble(views::Widget::CreateParams::Type type,
+               bool show_while_screen_is_locked)
+    : border_contents_(NULL),
       delegate_(NULL),
       show_status_(kOpen),
       fade_away_on_close_(false),
+      type_(type),
       show_while_screen_is_locked_(show_while_screen_is_locked),
       arrow_location_(BubbleBorder::NONE),
       contents_(NULL) {
 }
 #endif
 
 Bubble::~Bubble() {
 }
 
 void Bubble::InitBubble(views::Widget* parent,
@@ skipping 21 matching lines @@
   set_window_ex_style(extended_style);
 
   DCHECK(!border_);
   border_ = new BorderWidgetWin();
 
   if (fade_in) {
     border_->SetOpacity(0);
     SetOpacity(0);
   }
 
-  border_->Init(CreateBorderContents(), parent->GetNativeView());
+  border_->InitBorderWidgetWin(CreateBorderContents(), parent->GetNativeView());
   border_->border_contents()->SetBackgroundColor(kBackgroundColor);
 
   // We make the BorderWidgetWin the owner of the Bubble HWND, so that the
   // latter is displayed on top of the former.
-  WidgetWin::Init(border_->GetNativeView(), gfx::Rect());
+  views::Widget::CreateParams params(views::Widget::CreateParams::TYPE_POPUP);
+  params.parent = border_->GetNativeView();
+  GetWidget()->Init(params);
 
   SetWindowText(GetNativeView(), delegate_->accessible_name().c_str());
 #elif defined(OS_LINUX)
-  MakeTransparent();
-  make_transient_to_parent();
-  WidgetGtk::InitWithWidget(parent, gfx::Rect());
+  views::Widget::CreateParams params(type_);
+  params.transparent = true;
+  params.parent_widget = parent;
+  GetWidget()->Init(params);
 #if defined(OS_CHROMEOS)
   {
     vector<int> params;
     params.push_back(show_while_screen_is_locked_ ? 1 : 0);
     chromeos::WmIpc::instance()->SetWindowType(
         GetNativeView(),
         chromeos::WM_IPC_WINDOW_CHROME_INFO_BUBBLE,
         &params);
   }
 #endif
@@ skipping 156 matching lines @@
     animation_->Hide();
 }
 
 bool Bubble::AcceleratorPressed(const views::Accelerator& accelerator) {
   if (!delegate_ || delegate_->CloseOnEscape()) {
     DoClose(true);
     return true;
   }
   return false;
 }