Introduce BubbleDialogDelegateView, which extends DialogDelegateView

ui/views/bubble/bubble_dialog_delegate.h

-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2016 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 UI_VIEWS_BUBBLE_BUBBLE_DELEGATE_H_
-#define UI_VIEWS_BUBBLE_BUBBLE_DELEGATE_H_
+#ifndef UI_VIEWS_BUBBLE_BUBBLE_DIALOG_DELEGATE_H_
+#define UI_VIEWS_BUBBLE_BUBBLE_DIALOG_DELEGATE_H_
 
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "ui/views/bubble/bubble_border.h"
 #include "ui/views/widget/widget.h"
-#include "ui/views/widget/widget_delegate.h"
 #include "ui/views/widget/widget_observer.h"
+#include "ui/views/window/dialog_delegate.h"
 
 namespace gfx {
 class FontList;
 class Rect;
 }
 
 namespace views {
 
 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 WidgetObserver {
+// BubbleDialogDelegateView is a special DialogDelegateView for bubbles. It
+// should be used in place of BubbleDelegateView as it shares more code with

[msw, 2016/02/22 21:43:56]

Can you rephrase this sentence? Why does the code sharing dictate use of this
class over BubbleDelegateView? Do you want to simply say "BubbleDelegateView is
deprecated, use this instead." (or something to that effect above the
BubbleDelegateView decl instead)?

[Evan Stade, 2016/02/22 22:58:23]

Done.

+// DialogDelegateView.
+class VIEWS_EXPORT BubbleDialogDelegateView : public DialogDelegateView,
+                                              public WidgetObserver {
  public:
   // Internal class name.
   static const char kViewClassName[];
 
   enum class CloseReason {
     DEACTIVATION,
     ESCAPE,
     CLOSE_BUTTON,
     UNKNOWN,
   };
 
-  BubbleDelegateView();
-  BubbleDelegateView(View* anchor_view, BubbleBorder::Arrow arrow);
-  ~BubbleDelegateView() override;
+  ~BubbleDialogDelegateView() override;
 
   // Create and initialize the bubble Widget(s) with proper bounds.
-  static Widget* CreateBubble(BubbleDelegateView* bubble_delegate);
+  static Widget* CreateBubble(BubbleDialogDelegateView* bubble_delegate);
 
   // WidgetDelegateView overrides:
-  BubbleDelegateView* AsBubbleDelegate() override;
   bool ShouldShowCloseButton() const override;
-  View* GetContentsView() override;
+  ClientView* CreateClientView(Widget* widget) override;
   NonClientFrameView* CreateNonClientFrameView(Widget* widget) override;
   void GetAccessibleState(ui::AXViewState* state) override;
   const char* GetClassName() const override;
 
   // WidgetObserver overrides:
   void OnWidgetClosing(Widget* widget) override;
   void OnWidgetDestroying(Widget* widget) override;
   void OnWidgetVisibilityChanging(Widget* widget, bool visible) override;
   void OnWidgetVisibilityChanged(Widget* widget, bool visible) override;
   void OnWidgetActivationChanged(Widget* widget, bool active) override;
@@ skipping 44 matching lines @@
 
   CloseReason close_reason() const { return close_reason_; }
 
   // Get the arrow's anchor rect in screen space.
   virtual gfx::Rect GetAnchorRect() const;
 
   // Allows delegates to provide custom parameters before widget initialization.
   virtual void OnBeforeBubbleWidgetInit(Widget::InitParams* params,
                                         Widget* widget) const;
 
-  // Creates and returns a view to be displayed at the bottom of the bubble.
-  virtual scoped_ptr<View> CreateFootnoteView();
-
   // Sets |margins_| to a default picked for smaller bubbles.
   void UseCompactMargins();
 
   // Sets the bubble alignment relative to the anchor. This may only be called
   // after calling CreateBubble.
   void SetAlignment(BubbleBorder::BubbleAlignment alignment);
 
   // Sets the bubble arrow paint type.
   void SetArrowPaintType(BubbleBorder::ArrowPaintType paint_type);
 
   // Call this method when the anchor bounds have changed to reposition the
   // bubble. The bubble is automatically repositioned when the anchor view
   // bounds change as a result of the widget's bounds changing.
   void OnAnchorBoundsChanged();
 
  protected:
+  BubbleDialogDelegateView();
+  BubbleDialogDelegateView(View* anchor_view, BubbleBorder::Arrow arrow);
+
   // Get bubble bounds from the anchor rect and client view's preferred size.
   virtual gfx::Rect GetBubbleBounds();
 
   // Return a FontList to use for the title of the bubble.
   // (The default is MediumFont).
   virtual const gfx::FontList& GetTitleFontList() const;
 
   // View overrides:
   bool AcceleratorPressed(const ui::Accelerator& accelerator) override;
   void OnNativeThemeChanged(const ui::NativeTheme* theme) override;
@@ skipping 61 matching lines @@
 
   // If true (defaults to true), the arrow may be mirrored and moved to fit the
   // bubble on screen better. It would be a no-op if the bubble has no arrow.
   bool adjust_if_offscreen_;
 
   // Parent native window of the bubble.
   gfx::NativeView parent_window_;
 
   CloseReason close_reason_;
 
-  DISALLOW_COPY_AND_ASSIGN(BubbleDelegateView);
+  DISALLOW_COPY_AND_ASSIGN(BubbleDialogDelegateView);
 };
 
 }  // namespace views
 
-#endif  // UI_VIEWS_BUBBLE_BUBBLE_DELEGATE_H_
+#endif  // UI_VIEWS_BUBBLE_BUBBLE_DELEGATE2_H_