Merge BorderContentsView into BubbleFrameView; simplify.

ui/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 UI_VIEWS_BUBBLE_BUBBLE_DELEGATE_H_
 #define UI_VIEWS_BUBBLE_BUBBLE_DELEGATE_H_
 #pragma once
 
 #include "base/gtest_prod_util.h"
 #include "ui/base/animation/animation_delegate.h"
@@ skipping 38 matching lines @@
   virtual void OnWidgetActivationChanged(Widget* widget, bool active) 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; }
 
   bool close_on_deactivate() const { return close_on_deactivate_; }
   void set_close_on_deactivate(bool close_on_deactivate) {
       close_on_deactivate_ = close_on_deactivate;
   }
 
-  bool allow_bubble_offscreen() const { return allow_bubble_offscreen_; }
-  void set_allow_bubble_offscreen(bool allow_bubble_offscreen) {
-    allow_bubble_offscreen_ = allow_bubble_offscreen;
-  }
-
   View* anchor_view() const { return anchor_view_; }
   void set_anchor_view(View* anchor_view) { anchor_view_ = anchor_view; }
 
+  BubbleBorder::ArrowLocation arrow_location() const { return arrow_location_; }
+  void set_arrow_location(BubbleBorder::ArrowLocation arrow_location) {
+      arrow_location_ = arrow_location;
+  }
+
   SkColor color() const { return color_; }
   void set_color(SkColor color) { color_ = color; }
 
   bool use_focusless() const { return use_focusless_; }
   void set_use_focusless(bool use_focusless) {
     use_focusless_ = use_focusless;
   }
 
   // Get the arrow's anchor rect in screen space.
   virtual gfx::Rect GetAnchorRect();
 
-  // Get the arrow's location on the bubble.
-  virtual BubbleBorder::ArrowLocation GetArrowLocation() 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();
@@ skipping 12 matching lines @@
   // Perform view initialization on the contents for bubble sizing.
   virtual void Init();
 
   // Resizes and potentially moves the Bubble to best accommodate the
   // contents preferred size.
   void SizeToContents();
 
   BubbleFrameView* GetBubbleFrameView() const;
 
  private:
-  FRIEND_TEST_ALL_PREFIXES(BubbleFrameViewBasicTest, NonClientHitTest);
+  FRIEND_TEST_ALL_PREFIXES(BubbleFrameViewTest, NonClientHitTest);
   FRIEND_TEST_ALL_PREFIXES(BubbleDelegateTest, CreateDelegate);
 
   // Get bubble bounds from the anchor point and client view's preferred size.
   gfx::Rect GetBubbleBounds();
 
 #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
 
   // Fade animation for bubble.
   scoped_ptr<ui::SlideAnimation> fade_animation_;
 
   // Flags controlling bubble closure on the escape key and deactivation.
   bool close_on_esc_;
   bool close_on_deactivate_;
 
-  // Whether the bubble is allowed to be displayed offscreen, or if auto
-  // re-positioning should be performed.
-  bool allow_bubble_offscreen_;
-
   // The view hosting this bubble; the arrow is anchored to this view.
   View* anchor_view_;
 
   // 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 (non-Aura Windows only).
   Widget* border_widget_;
 
   // Create a popup window for focusless bubbles on Linux/ChromeOS.
   // These bubbles are not interactive and should not gain focus.
   bool use_focusless_;
 
   DISALLOW_COPY_AND_ASSIGN(BubbleDelegateView);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_BUBBLE_BUBBLE_DELEGATE_H_