Make BubbleWindow a Widget override with a BubbleFrameView.

chrome/browser/ui/views/window.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/window.h"
 
 #include "ui/views/bubble/bubble_delegate.h"
 #include "ui/views/widget/widget.h"
 
-#if defined(OS_CHROMEOS) && defined(TOOLKIT_USES_GTK)
+#if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/frame/bubble_window.h"
+
+#if defined(TOOLKIT_USES_GTK)
 #include "chrome/browser/chromeos/legacy_window_manager/wm_ipc.h"
 #include "third_party/cros_system_api/window_manager/chromeos_wm_ipc_enums.h"
-#endif
+#endif  // TOOLKIT_USES_GTK
+
+#endif  // OS_CHROMEOS

[James Cook, 2011/12/06 04:48:34]

Thanks for commenting the #endif's -- I find this helps me a lot with nested
#defines.

[msw, 2011/12/06 06:05:14]

:)

 
 namespace browser {
 
 views::Widget* CreateViewsWindow(gfx::NativeWindow parent,
                                  views::WidgetDelegate* delegate,
                                  DialogStyle style) {
-#if defined(OS_CHROMEOS) && defined(TOOLKIT_USES_GTK)
-  // TODO(msw): revert to BubbleWindow for all ChromeOS cases when CL
-  // for crbug.com/98322 is landed.
+#if defined(OS_CHROMEOS)
   return chromeos::BubbleWindow::Create(parent, style, delegate);
 #else
   return views::Widget::CreateWindowWithParent(delegate, parent);
 #endif
 }
 
 views::Widget* CreateViewsBubble(views::BubbleDelegateView* delegate) {
   views::Widget* bubble_widget =
       views::BubbleDelegateView::CreateBubble(delegate);
 #if defined(OS_CHROMEOS) && defined(TOOLKIT_USES_GTK)
@@ skipping 18 matching lines @@
   params.push_back(1);  // Show while screen is locked.
   chromeos::WmIpc::instance()->SetWindowType(
       bubble_widget->GetNativeView(),
       chromeos::WM_IPC_WINDOW_CHROME_INFO_BUBBLE,
       &params);
 #endif
   return bubble_widget;
 }
 
 }  // namespace browser