Rework the way Widget::Init works:

chrome/browser/ui/views/bubble/bubble.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_BUBBLE_BUBBLE_H_
 #define CHROME_BROWSER_UI_VIEWS_BUBBLE_BUBBLE_H_
 #pragma once
 
 #include "chrome/browser/ui/views/bubble/bubble_border.h"
 #include "ui/base/animation/animation_delegate.h"
@@ skipping 117 matching lines @@
 
   // Overridden from ui::AnimationDelegate:
   virtual void AnimationEnded(const ui::Animation* animation);
   virtual void AnimationProgressed(const ui::Animation* animation);
 
   static const SkColor kBackgroundColor;
 
  protected:
   Bubble();
 #if defined(OS_CHROMEOS)
-  Bubble(views::WidgetGtk::Type type, bool show_while_screen_is_locked);
+  Bubble(views::Widget::CreateParams::Type type,
+         bool show_while_screen_is_locked);
 #endif
   virtual ~Bubble();
 
   // Creates the Bubble.
   virtual void InitBubble(views::Widget* parent,
                           const gfx::Rect& position_relative_to,
                           BubbleBorder::ArrowLocation arrow_location,
                           views::View* contents,
                           BubbleDelegate* delegate);
 
@@ skipping 45 matching lines @@
   // The animation used to fade the bubble out.
   scoped_ptr<ui::SlideAnimation> animation_;
 
   // The current visibility status of the bubble.
   ShowStatus show_status_;
 
   // Whether to fade away when the bubble closes.
   bool fade_away_on_close_;
 
 #if defined(OS_CHROMEOS)
+  // Some callers want the bubble to be a child control instead of a window.
+  views::Widget::CreateParams::Type type_;
   // Should we set a property telling the window manager to show this window
   // onscreen even when the screen is locked?
   bool show_while_screen_is_locked_;
 #endif
 
   gfx::Rect position_relative_to_;
   BubbleBorder::ArrowLocation arrow_location_;
 
   views::View* contents_;
 
   DISALLOW_COPY_AND_ASSIGN(Bubble);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_BUBBLE_BUBBLE_H_