Support Windows native textfield, combobox, etc. in new bubbles.

views/bubble/bubble_delegate.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 VIEWS_BUBBLE_BUBBLE_DELEGATE_H_
 #define VIEWS_BUBBLE_BUBBLE_DELEGATE_H_
 #pragma once
 
+#include "base/gtest_prod_util.h"
 #include "ui/base/animation/animation_delegate.h"
 #include "views/bubble/bubble_border.h"
 #include "views/widget/widget_delegate.h"
 
 namespace ui {
 class SlideAnimation;
 }  // namespace ui
 
 namespace views {
 
 class BubbleFrameView;
-class BubbleView;
 
 // BubbleDelegateView creates frame and client views for bubble Widgets.
 // BubbleDelegateView itself is the client's contents view.
 //
 ///////////////////////////////////////////////////////////////////////////////
 class VIEWS_EXPORT BubbleDelegateView : public WidgetDelegateView,
                                         public ui::AnimationDelegate {
  public:
   BubbleDelegateView();
   BubbleDelegateView(const gfx::Point& anchor_point,
                      BubbleBorder::ArrowLocation arrow_location,
                      const SkColor& color);
   virtual ~BubbleDelegateView();
 
   // Create a bubble Widget from the argument BubbleDelegateView.
   static Widget* CreateBubble(BubbleDelegateView* bubble_delegate,

[alicet1, 2011/10/31 18:48:31]

hmm. I'm wondering what to do with the return widget -- the caller will have to
call Show() on the delegate view, and not on the widget alone. To get to the
content's widget, it will have to call delegate->GetWidget(), as opposed to if
we return a Widget* here, to get to the delegate, they will need
static_cast<...>(widget->widget_delegate())->Show(), or hold on to it somehow.

what do you think?

[msw, 2011/10/31 19:31:17]

I'm not sure what you mean. Users can cache a pointer to the delegate if
desired, as in the example.

We considered a views::Bubble last week for holding delegate/widgets ptrs and
exposing show/fade/close/etc, but I think we agreed that hanging onto the
delegate pointer seemed sufficient. Any new thoughts?

[alicet1, 2011/10/31 23:26:59]

no, what I mean is what if this method is
static void CreateBubble(....);

I'm not sure if it needs to return a widget at all. Callers will have to cache
the delegate anyway. delegate->GetWidget() will always get it back for them, no?

[msw, 2011/11/01 00:27:36]

Done; I guess that's reasonable. It'd be nice to make the bubble workflow a
little less awkward, but we gotta get cracking on converting these bubbles.

                               Widget* parent_widget);
 
   // WidgetDelegate overrides:
   virtual View* GetInitiallyFocusedView() OVERRIDE;
   virtual View* GetContentsView() OVERRIDE;
-  virtual ClientView* CreateClientView(Widget* widget) OVERRIDE;
   virtual NonClientFrameView* CreateNonClientFrameView() OVERRIDE;
 
   bool close_on_esc() const { return close_on_esc_; }
   void set_close_on_esc(bool close_on_esc) { close_on_esc_ = close_on_esc; }
 
   // Get the arrow's anchor point in screen space.
   virtual gfx::Point GetAnchorPoint();
 
   // Get the arrow's location on the bubble.
   virtual BubbleBorder::ArrowLocation GetArrowLocation() const;
 
   // Get the color used for the background and border.
   virtual SkColor GetColor() const;
 
+  // Show the bubble's widget (and |border_widget_| on Windows).
+  void Show();
+
   // Fade the bubble in or out via Widget transparency.
   // Fade in calls Widget::Show; fade out calls Widget::Close upon completion.
   void StartFade(bool fade_in);
 
   // Reset fade and opacity of bubble. Restore the opacity of the
   // bubble to the setting before StartFade() was called.
   void ResetFade();
 
  protected:
   // View overrides:
   virtual bool AcceleratorPressed(const Accelerator& accelerator) OVERRIDE;
 
   // Perform view initialization on the contents for bubble sizing.
   virtual void Init();
 
  private:
+  FRIEND_TEST_ALL_PREFIXES(BubbleFrameViewBasicTest, NonClientHitTest);
+  FRIEND_TEST_ALL_PREFIXES(BubbleDelegateTest, CreateArrowBubble);
+
   // ui::AnimationDelegate overrides:
   virtual void AnimationEnded(const ui::Animation* animation);
   virtual void AnimationProgressed(const ui::Animation* animation);
 
-  const BubbleView* GetBubbleView() const;
-  const BubbleFrameView* GetBubbleFrameView() const;
+  BubbleFrameView* GetBubbleFrameView() const;
 
   // Get bubble bounds from the anchor point and client view's preferred size.
   gfx::Rect GetBubbleBounds();
 
+#if defined(OS_WIN) && !defined(USE_AURA)
+  // Initialize the border widget needed for Windows native control hosting.
+  void InitializeBorderWidget(Widget* parent_widget);
+
+  // Get bounds for the Windows-only widget that hosts the bubble's contents.
+  gfx::Rect GetBubbleClientBounds() const;
+#endif
+
   // Fade animation for bubble.
   scoped_ptr<ui::SlideAnimation> fade_animation_;
 
   // Should this bubble close on the escape key?
   bool close_on_esc_;
 
   // The screen point where this bubble's arrow is anchored.
   gfx::Point anchor_point_;
 
   // The arrow's location on the bubble.
   BubbleBorder::ArrowLocation arrow_location_;
 
   // The background color of the bubble.
   SkColor color_;
 
   // Original opacity of the bubble.
   int original_opacity_;
+
+  // The widget hosting the border for this bubble (only used on Windows).

[alicet1, 2011/10/31 18:48:31]

this is non-aura windows only, no?

[msw, 2011/10/31 19:31:17]

Comment updated.

+  Widget* border_widget_;
+
+  DISALLOW_COPY_AND_ASSIGN(BubbleDelegateView);
 };
 
 }  // namespace views
 
 #endif  // VIEWS_BUBBLE_BUBBLE_DELEGATE_H_