Rework the way Widget::Init works:

chrome/browser/chromeos/login/message_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/chromeos/login/message_bubble.h"
 
 #include "base/logging.h"
 #include "chrome/browser/chromeos/login/helper.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "views/controls/button/image_button.h"
 #include "views/controls/image_view.h"
 #include "views/controls/label.h"
 #include "views/layout/grid_layout.h"
 #include "views/widget/widget.h"
 
 namespace chromeos {
 
 static const int kBorderSize = 4;
 static const int kMaxLabelWidth = 250;
 
-MessageBubble::MessageBubble(views::WidgetGtk::Type type,
-                             views::Widget* parent,
+MessageBubble::MessageBubble(views::Widget* parent,
                              SkBitmap* image,
                              const std::wstring& text,
                              const std::wstring& help,
                              bool grab_enabled,
                              MessageBubbleDelegate* delegate)
-    : Bubble(type, false),  // don't show while screen is locked
+    : Bubble(false),  // don't show while screen is locked
       parent_(parent),
       help_link_(NULL),
       message_delegate_(delegate),
       grab_enabled_(grab_enabled) {
   using views::GridLayout;
 
   views::View* control_view = new views::View();
   GridLayout* layout = new GridLayout(control_view);
   control_view->SetLayoutManager(layout);
   views::ColumnSet* column_set = layout->AddColumnSet(0);
@@ skipping 64 matching lines @@
 
 // static
 MessageBubble* MessageBubble::Show(views::Widget* parent,
                                    const gfx::Rect& position_relative_to,
                                    BubbleBorder::ArrowLocation arrow_location,
                                    SkBitmap* image,
                                    const std::wstring& text,
                                    const std::wstring& help,
                                    MessageBubbleDelegate* delegate) {
   // The bubble will be destroyed when it is closed.
-  MessageBubble* bubble = new MessageBubble(
-      views::WidgetGtk::TYPE_WINDOW, parent, image, text, help, true, delegate);
+  MessageBubble* bubble = new MessageBubble(parent, image, text, help, true,
+                                            delegate);
   bubble->InitBubble(parent, position_relative_to, arrow_location,
                      bubble->text_->parent(), delegate);
   return bubble;
 }
 
 // static
 MessageBubble* MessageBubble::ShowNoGrab(
     views::Widget* parent,
     const gfx::Rect& position_relative_to,
     BubbleBorder::ArrowLocation arrow_location,
     SkBitmap* image,
     const std::wstring& text,
     const std::wstring& help,
     MessageBubbleDelegate* delegate) {
   // The bubble will be destroyed when it is closed.
-  MessageBubble* bubble = new MessageBubble(
-      views::WidgetGtk::TYPE_CHILD, parent, image, text, help, false, delegate);
+  MessageBubble* bubble = new MessageBubble(parent, image, text, help, false,
+                                            delegate);
   bubble->InitBubble(parent, position_relative_to, arrow_location,
                      bubble->text_->parent(), delegate);
   return bubble;
 }
 
 void MessageBubble::IsActiveChanged() {
   // Active parent instead.
   if (parent_ && IsActive()) {
     gtk_window_present_with_time(
         GTK_WINDOW(static_cast<WidgetGtk*>(parent_)->GetNativeView()),
                    gtk_get_current_event_time());
   }
 }
 
 void MessageBubble::SetMouseCapture() {
   if (grab_enabled_)
     WidgetGtk::SetMouseCapture();
 }
 
 void MessageBubble::Close() {
   parent_ = NULL;
   Bubble::Close();
 }
 
 }  // namespace chromeos