Index: ui/app_list/app_list_bubble_border.h |
diff --git a/ui/app_list/app_list_bubble_border.h b/ui/app_list/app_list_bubble_border.h |
index 3aea4527c75e5545d5ab4035b1577fc1d7e6a8b1..edabdebac6d6d292ba0238586a6c6263f992afb3 100644 |
--- a/ui/app_list/app_list_bubble_border.h |
+++ b/ui/app_list/app_list_bubble_border.h |
@@ -7,52 +7,28 @@ |
#include "base/basictypes.h" |
#include "ui/gfx/shadow_value.h" |
-#include "ui/views/bubble/bubble_border.h" |
+#include "ui/views/bubble/bubble_border_geometric.h" |
namespace app_list { |
// A class to paint bubble border and background. |
-class AppListBubbleBorder : public views::BubbleBorder { |
+class AppListBubbleBorder : public views::BubbleBorderGeometric { |
public: |
AppListBubbleBorder(views::View* app_list_view, |
views::View* search_box_view); |
virtual ~AppListBubbleBorder(); |
- bool ArrowAtTopOrBottom() const; |
- bool ArrowOnLeftOrRight() const; |
- |
- void GetMask(const gfx::Rect& bounds, gfx::Path* mask) const; |
- |
- void set_offset(const gfx::Point& offset) { offset_ = offset; } |
- const gfx::Point& offset() const { return offset_; } |
- |
private: |
- // Gets arrow offset based on arrow location and |offset_|. |
- int GetArrowOffset() const; |
- |
+ // views::ImagelessBubbleBorder overrides: |
void PaintBackground(gfx::Canvas* canvas, |
const gfx::Rect& bounds) const; |
- // views::BubbleBorder overrides: |
- virtual void GetInsets(gfx::Insets* insets) const OVERRIDE; |
- virtual gfx::Rect GetBounds(const gfx::Rect& position_relative_to, |
- const gfx::Size& contents_size) const OVERRIDE; |
- |
- // views::Border overrides: |
- virtual void Paint(const views::View& view, |
- gfx::Canvas* canvas) const OVERRIDE; |
- |
// AppListView hosted inside this bubble. |
const views::View* app_list_view_; // Owned by views hierarchy. |
// Children view of AppListView that needs to paint background. |
const views::View* search_box_view_; // Owned by views hierarchy. |
- // Offset in pixels relative the default middle position. |
- gfx::Point offset_; |
- |
- gfx::ShadowValues shadows_; |
- |
DISALLOW_COPY_AND_ASSIGN(AppListBubbleBorder); |
}; |