move chromeos bubble setup code to window.cc

ui/views/bubble/bubble_delegate.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 <vector>

[Daniel Erat, 2011/11/21 16:59:09]

bubble_delegate.h should be included before anything else

[alicet1, 2011/11/21 20:58:45]

Done.

+
 #include "ui/views/bubble/bubble_delegate.h"
 
 #include "ui/base/animation/slide_animation.h"
 #include "ui/views/bubble/bubble_frame_view.h"
 #include "views/widget/widget.h"
 
+#if defined(OS_CHROMEOS) && 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
+
 // The duration of the fade animation in milliseconds.
 static const int kHideFadeDurationMS = 200;
 
 namespace views {
 
 namespace {
 
 // Create a widget to host the bubble.
 Widget* CreateBubbleWidget(BubbleDelegateView* bubble, Widget* parent) {
   Widget* bubble_widget = new Widget();
   Widget::InitParams bubble_params(Widget::InitParams::TYPE_BUBBLE);
   bubble_params.delegate = bubble;
   bubble_params.transparent = true;
   bubble_params.parent_widget = parent;
 #if defined(OS_WIN) && !defined(USE_AURA)
   bubble_params.type = Widget::InitParams::TYPE_WINDOW_FRAMELESS;
   bubble_params.transparent = false;
 #endif
   bubble_widget->Init(bubble_params);
+#if defined(OS_CHROMEOS) && defined(TOOLKIT_USES_GTK)
+  {
+    std::vector<int> params;
+    params.push_back(bubble->show_while_screen_is_locked());
+    chromeos::WmIpc::instance()->SetWindowType(
+        bubble_widget->GetNativeView(),
+        chromeos::WM_IPC_WINDOW_CHROME_INFO_BUBBLE,
+        &params);
+  }
+#endif
   return bubble_widget;
 }
 
 #if defined(OS_WIN) && !defined(USE_AURA)
 // The border widget's delegate, needed for transparent Windows native controls.
 // TODO(msw): Remove this when Windows native controls are no longer needed.
 class VIEWS_EXPORT BubbleBorderDelegateView : public WidgetDelegateView {
  public:
   explicit BubbleBorderDelegateView(BubbleDelegateView* bubble)
       : bubble_(bubble) {}
@@ skipping 32 matching lines @@
 }  // namespace
 
 BubbleDelegateView::BubbleDelegateView()
     : close_on_esc_(true),
       close_on_deactivate_(true),
       allow_bubble_offscreen_(false),
       anchor_view_(NULL),
       arrow_location_(BubbleBorder::TOP_LEFT),
       color_(SK_ColorWHITE),
       border_widget_(NULL),
-      use_focusless_(false) {
+      use_focusless_(false),
+      show_while_screen_is_locked_(false) {
   set_background(views::Background::CreateSolidBackground(color_));
   AddAccelerator(ui::Accelerator(ui::VKEY_ESCAPE, 0));
 }
 
 BubbleDelegateView::BubbleDelegateView(
     View* anchor_view,
     BubbleBorder::ArrowLocation arrow_location,
     const SkColor& color)
     : close_on_esc_(true),
       close_on_deactivate_(true),
       allow_bubble_offscreen_(false),
       anchor_view_(anchor_view),
       arrow_location_(arrow_location),
       color_(color),
       original_opacity_(255),
       border_widget_(NULL),
-      use_focusless_(false) {
+      use_focusless_(false),
+      show_while_screen_is_locked_(false) {
   set_background(views::Background::CreateSolidBackground(color_));
   AddAccelerator(ui::Accelerator(ui::VKEY_ESCAPE, 0));
 }
 
 BubbleDelegateView::~BubbleDelegateView() {
   if (border_widget_)
     border_widget_->Close();
 }
 
 // static
@@ skipping 168 matching lines @@
 
 #if defined(OS_WIN) && !defined(USE_AURA)
 gfx::Rect BubbleDelegateView::GetBubbleClientBounds() const {
   gfx::Rect client_bounds(GetBubbleFrameView()->GetBoundsForClientView());
   client_bounds.Offset(border_widget_->GetWindowScreenBounds().origin());
   return client_bounds;
 }
 #endif
 
 }  // namespace views