Remove the Views bubble double widget hack.

Views bubbles had a hack to use two separate widgets.
The border widget supported per-pixel alpha for edge images.
The content widget supported native windows textfields, etc.
This isn't needed after win textfield removal in r235220.

Remove BubbleBorderDelegate and the border widget code.
Remove BubbleDelegateView::GetBubbleClientBounds
Remove BubbleBorder::client_bounds and usage.
(was used to clip intersecting widget area during fade)

BUG=131660
TEST=No visual difference, no regressions (I tested that bubbles still work on a local non-Aura Win build too).
R=sky@chromium.org

Review URL: https://codereview.chromium.org/73533002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@235715 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 8 insertions, 165 deletions

diff --git a/ui/views/bubble/bubble_border.cc b/ui/views/bubble/bubble_border.cc
index 0ea5057..e9cad29 100644
--- a/ui/views/bubble/bubble_border.cc
+++ b/ui/views/bubble/bubble_border.cc
@@ -354,12 +354,6 @@ void BubbleBackground::Paint(gfx::Canvas* canvas, views::View* view) const {
   if (border_->shadow() == BubbleBorder::NO_SHADOW_OPAQUE_BORDER)
     canvas->DrawColor(border_->background_color());
 
-  // Clip out the client bounds to prevent overlapping transparent widgets.
-  if (!border_->client_bounds().IsEmpty()) {
-    SkRect client_rect(gfx::RectToSkRect(border_->client_bounds()));
-    canvas->sk_canvas()->clipRect(client_rect, SkRegion::kDifference_Op);
-  }
-
   // Fill the contents with a round-rect region to match the border images.
   SkPaint paint;
   paint.setAntiAlias(true);
diff --git a/ui/views/bubble/bubble_border.h b/ui/views/bubble/bubble_border.h
index 23fdde3..558f14f 100644
--- a/ui/views/bubble/bubble_border.h
+++ b/ui/views/bubble/bubble_border.h
@@ -135,10 +135,6 @@ class VIEWS_EXPORT BubbleBorder : public Border {
   void set_background_color(SkColor color) { background_color_ = color; }
   SkColor background_color() const { return background_color_; }
 
-  // Get or set the client_bounds, a Windows-only temporary hack.
-  void set_client_bounds(const gfx::Rect& bounds) { client_bounds_ = bounds; }
-  const gfx::Rect& client_bounds() const { return client_bounds_; }
-
   // Sets a desired pixel distance between the arrow tip and the outside edge of
   // the neighboring border image. For example:    |----offset----|
   // '(' represents shadow around the '{' edge:    ((({           ^   })))
@@ -180,10 +176,6 @@ class VIEWS_EXPORT BubbleBorder : public Border {
   internal::BorderImages* images_;
   SkColor background_color_;
 
-  // The client/content bounds; must be clipped from the background on Windows.
-  // TODO(msw): Clean this up when Windows native controls are no longer needed.
-  gfx::Rect client_bounds_;
-
   DISALLOW_COPY_AND_ASSIGN(BubbleBorder);
 };
 
diff --git a/ui/views/bubble/bubble_delegate.cc b/ui/views/bubble/bubble_delegate.cc
index fcc87ad3..987d352 100644
--- a/ui/views/bubble/bubble_delegate.cc
+++ b/ui/views/bubble/bubble_delegate.cc
@@ -39,10 +39,6 @@ Widget* CreateBubbleWidget(BubbleDelegateView* bubble) {
   else if (bubble->anchor_widget())
     bubble_params.parent = bubble->anchor_widget()->GetNativeView();
   bubble_params.can_activate = bubble->CanActivate();
-#if defined(OS_WIN) && !defined(USE_AURA)
-  bubble_params.type = Widget::InitParams::TYPE_WINDOW_FRAMELESS;
-  bubble_params.opacity = Widget::InitParams::OPAQUE_WINDOW;
-#endif
   bubble->OnBeforeBubbleWidgetInit(&bubble_params, bubble_widget);
   bubble_widget->Init(bubble_params);
   return bubble_widget;
@@ -50,83 +46,6 @@ Widget* CreateBubbleWidget(BubbleDelegateView* bubble) {
 
 }  // namespace
 
-#if defined(OS_WIN) && !defined(USE_AURA)
-// Windows uses two widgets and some extra complexity to host partially
-// transparent native controls and use per-pixel HWND alpha on the border.
-// TODO(msw): Clean these up when Windows native controls are no longer needed.
-class BubbleBorderDelegate : public WidgetDelegate,
-                             public WidgetObserver {
- public:
-  BubbleBorderDelegate(BubbleDelegateView* bubble, Widget* widget)
-      : bubble_(bubble),
-        widget_(widget) {
-    bubble_->GetWidget()->AddObserver(this);
-  }
-
-  virtual ~BubbleBorderDelegate() {
-    DetachFromBubble();
-  }
-
-  // WidgetDelegate overrides:
-  virtual bool CanActivate() const OVERRIDE { return false; }
-  virtual string16 GetWindowTitle() const OVERRIDE {
-    return bubble_->GetWindowTitle();
-  }
-  virtual bool ShouldShowCloseButton() const OVERRIDE {
-    return bubble_->ShouldShowCloseButton();
-  }
-  virtual void DeleteDelegate() OVERRIDE { delete this; }
-  virtual Widget* GetWidget() OVERRIDE { return widget_; }
-  virtual const Widget* GetWidget() const OVERRIDE { return widget_; }
-  virtual NonClientFrameView* CreateNonClientFrameView(
-      Widget* widget) OVERRIDE {
-    return bubble_->CreateNonClientFrameView(widget);
-  }
-
-  // WidgetObserver overrides:
-  virtual void OnWidgetDestroying(Widget* widget) OVERRIDE {
-    DetachFromBubble();
-    widget_->Close();
-  }
-
- private:
-  // Removes state installed on |bubble_|, including references |bubble_| has to
-  // us.
-  void DetachFromBubble() {
-    if (!bubble_)
-      return;
-    if (bubble_->GetWidget())
-      bubble_->GetWidget()->RemoveObserver(this);
-    bubble_->border_widget_ = NULL;
-    bubble_ = NULL;
-  }
-
-  BubbleDelegateView* bubble_;
-  Widget* widget_;
-
-  DISALLOW_COPY_AND_ASSIGN(BubbleBorderDelegate);
-};
-
-namespace {
-
-// Create a widget to host the bubble's border.
-Widget* CreateBorderWidget(BubbleDelegateView* bubble) {
-  Widget* border_widget = new Widget();
-  Widget::InitParams border_params(Widget::InitParams::TYPE_BUBBLE);
-  border_params.delegate = new BubbleBorderDelegate(bubble, border_widget);
-  border_params.opacity = Widget::InitParams::TRANSLUCENT_WINDOW;
-  border_params.parent = bubble->GetWidget()->GetNativeView();
-  border_params.can_activate = false;
-  border_params.accept_events = bubble->border_accepts_events();
-  border_widget->Init(border_params);
-  border_widget->set_focus_on_creation(false);
-  return border_widget;
-}
-
-}  // namespace
-
-#endif
-
 BubbleDelegateView::BubbleDelegateView()
     : close_on_esc_(true),
       close_on_deactivate_(true),
@@ -138,7 +57,6 @@ BubbleDelegateView::BubbleDelegateView()
       color_explicitly_set_(false),
       margins_(kDefaultMargin, kDefaultMargin, kDefaultMargin, kDefaultMargin),
       original_opacity_(255),
-      border_widget_(NULL),
       use_focusless_(false),
       accept_events_(true),
       border_accepts_events_(true),
@@ -161,7 +79,6 @@ BubbleDelegateView::BubbleDelegateView(
       color_explicitly_set_(false),
       margins_(kDefaultMargin, kDefaultMargin, kDefaultMargin, kDefaultMargin),
       original_opacity_(255),
-      border_widget_(NULL),
       use_focusless_(false),
       accept_events_(true),
       border_accepts_events_(true),
@@ -183,17 +100,11 @@ Widget* BubbleDelegateView::CreateBubble(BubbleDelegateView* bubble_delegate) {
   bubble_delegate->SetAnchorView(bubble_delegate->GetAnchorView());
   Widget* bubble_widget = CreateBubbleWidget(bubble_delegate);
 
-#if defined(OS_WIN)
-#if defined(USE_AURA)
+#if defined(OS_WIN) && defined(USE_AURA)
   // If glass is enabled, the bubble is allowed to extend outside the bounds of
   // the parent frame and let DWM handle compositing.  If not, then we don't
   // want to allow the bubble to extend the frame because it will be clipped.
   bubble_delegate->set_adjust_if_offscreen(ui::win::IsAeroGlassEnabled());
-#else
-  // First set the contents view to initialize view bounds for widget sizing.
-  bubble_widget->SetContentsView(bubble_delegate->GetContentsView());
-  bubble_delegate->border_widget_ = CreateBorderWidget(bubble_delegate);
-#endif
 #endif
 
   bubble_delegate->SizeToContents();
@@ -293,8 +204,6 @@ void BubbleDelegateView::StartFade(bool fade_in) {
   fade_animation_->Reset(fade_in ? 0.0 : 1.0);
   if (fade_in) {
     original_opacity_ = 0;
-    if (border_widget_)
-      border_widget_->SetOpacity(original_opacity_);
     GetWidget()->SetOpacity(original_opacity_);
     GetWidget()->Show();
     fade_animation_->Show();
@@ -307,8 +216,6 @@ void BubbleDelegateView::StartFade(bool fade_in) {
 
 void BubbleDelegateView::ResetFade() {
   fade_animation_.reset();
-  if (border_widget_)
-    border_widget_->SetOpacity(original_opacity_);
   GetWidget()->SetOpacity(original_opacity_);
 }
 
@@ -354,21 +261,7 @@ void BubbleDelegateView::AnimationProgressed(const gfx::Animation* animation) {
   if (animation != fade_animation_.get())
     return;
   DCHECK(fade_animation_->is_animating());
-  unsigned char opacity = fade_animation_->GetCurrentValue() * 255;
-#if defined(OS_WIN) && !defined(USE_AURA)
-  // Explicitly set the content Widget's layered style and set transparency via
-  // SetLayeredWindowAttributes. This is done because initializing the Widget as
-  // transparent and setting opacity via UpdateLayeredWindow doesn't support
-  // hosting child native Windows controls.
-  const HWND hwnd = GetWidget()->GetNativeView();
-  const DWORD style = GetWindowLong(hwnd, GWL_EXSTYLE);
-  if ((opacity == 255) == !!(style & WS_EX_LAYERED))
-    SetWindowLong(hwnd, GWL_EXSTYLE, style ^ WS_EX_LAYERED);
-  SetLayeredWindowAttributes(hwnd, 0, opacity, LWA_ALPHA);
-  // Update the border widget's opacity.
-  border_widget_->SetOpacity(opacity);
-#endif
-  GetWidget()->SetOpacity(opacity);
+  GetWidget()->SetOpacity(fade_animation_->GetCurrentValue() * 255);
 }
 
 void BubbleDelegateView::Init() {}
@@ -402,22 +295,12 @@ void BubbleDelegateView::SetAnchorView(View* anchor_view) {
 }
 
 void BubbleDelegateView::SizeToContents() {
-#if defined(OS_WIN) && !defined(USE_AURA)
-  border_widget_->SetBounds(GetBubbleBounds());
-  GetWidget()->SetBounds(GetBubbleClientBounds());
-
-  // Update the local client bounds clipped out by the border widget background.
-  // Used to correctly display overlapping semi-transparent widgets on Windows.
-  GetBubbleFrameView()->bubble_border()->set_client_bounds(
-      GetBubbleFrameView()->GetBoundsForClientView());
-#else
   GetWidget()->SetBounds(GetBubbleBounds());
-#endif
 }
 
 BubbleFrameView* BubbleDelegateView::GetBubbleFrameView() const {
-  const Widget* widget = border_widget_ ? border_widget_ : GetWidget();
-  const NonClientView* view = widget ? widget->non_client_view() : NULL;
+  const NonClientView* view =
+      GetWidget() ? GetWidget()->non_client_view() : NULL;
   return view ? static_cast<BubbleFrameView*>(view->frame_view()) : NULL;
 }
 
@@ -443,28 +326,10 @@ void BubbleDelegateView::UpdateColorsFromTheme(const ui::NativeTheme* theme) {
     frame_view->bubble_border()->set_background_color(color());
 }
 
-#if defined(OS_WIN) && !defined(USE_AURA)
-gfx::Rect BubbleDelegateView::GetBubbleClientBounds() const {
-  gfx::Rect client_bounds(GetBubbleFrameView()->GetBoundsForClientView());
-  client_bounds.Offset(
-      border_widget_->GetWindowBoundsInScreen().OffsetFromOrigin());
-  return client_bounds;
-}
-#endif
-
-void BubbleDelegateView::HandleVisibilityChanged(Widget* widget,
-                                                 bool visible) {
-  if (widget != GetWidget())
-    return;
-
-  if (visible) {
-    if (border_widget_)
-      border_widget_->ShowInactive();
-    if (anchor_widget() && anchor_widget()->GetTopLevelWidget())
-      anchor_widget()->GetTopLevelWidget()->DisableInactiveRendering();
-  } else {
-    if (border_widget_)
-      border_widget_->Hide();
+void BubbleDelegateView::HandleVisibilityChanged(Widget* widget, bool visible) {
+  if (widget == GetWidget() && visible && anchor_widget() &&
+      anchor_widget()->GetTopLevelWidget()) {
+    anchor_widget()->GetTopLevelWidget()->DisableInactiveRendering();
   }
 }
 
diff --git a/ui/views/bubble/bubble_delegate.h b/ui/views/bubble/bubble_delegate.h
index f30523b..ccb422a 100644
--- a/ui/views/bubble/bubble_delegate.h
+++ b/ui/views/bubble/bubble_delegate.h
@@ -19,13 +19,10 @@ class SlideAnimation;
 
 namespace views {
 
-class BubbleBorderDelegate;
 class BubbleFrameView;
 
 // BubbleDelegateView creates frame and client views for bubble Widgets.
 // BubbleDelegateView itself is the client's contents view.
-//
-///////////////////////////////////////////////////////////////////////////////
 class VIEWS_EXPORT BubbleDelegateView : public WidgetDelegateView,
                                         public gfx::AnimationDelegate,
                                         public WidgetObserver {
@@ -170,11 +167,6 @@ class VIEWS_EXPORT BubbleDelegateView : public WidgetDelegateView,
   // Update the bubble color from |theme|, unless it was explicitly set.
   void UpdateColorsFromTheme(const ui::NativeTheme* theme);
 
-#if defined(OS_WIN) && !defined(USE_AURA)
-  // Get bounds for the Windows-only widget that hosts the bubble's contents.
-  gfx::Rect GetBubbleClientBounds() const;
-#endif
-
   // Handles widget visibility changes.
   void HandleVisibilityChanged(Widget* widget, bool visible);