Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / ui / views / bubble / bubble_frame_view.cc

diff --git a/src/ui/views/bubble/bubble_frame_view.cc b/src/ui/views/bubble/bubble_frame_view.cc
index d89aef8..e3eb3c8 100644 (file)
--- a/src/ui/views/bubble/bubble_frame_view.cc
+++ b/src/ui/views/bubble/bubble_frame_view.cc
@@ -57,12 +57,6 @@ namespace views {
 // static
 const char BubbleFrameView::kViewClassName[] = "BubbleFrameView";
 
-// static
-gfx::Insets BubbleFrameView::GetTitleInsets() {
-  return gfx::Insets(kTitleTopInset, kTitleLeftInset,
-                     kTitleBottomInset, kTitleRightInset);
-}
-
 BubbleFrameView::BubbleFrameView(const gfx::Insets& content_margins)
     : bubble_border_(NULL),
       content_margins_(content_margins),
@@ -75,21 +69,34 @@ BubbleFrameView::BubbleFrameView(const gfx::Insets& content_margins)
   title_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   AddChildView(title_);
 
-  close_ = new LabelButton(this, base::string16());
-  close_->SetImage(CustomButton::STATE_NORMAL,
-                   *rb.GetImageNamed(IDR_CLOSE_DIALOG).ToImageSkia());
-  close_->SetImage(CustomButton::STATE_HOVERED,
-                   *rb.GetImageNamed(IDR_CLOSE_DIALOG_H).ToImageSkia());
-  close_->SetImage(CustomButton::STATE_PRESSED,
-                   *rb.GetImageNamed(IDR_CLOSE_DIALOG_P).ToImageSkia());
-  close_->SetBorder(scoped_ptr<Border>());
-  close_->SetSize(close_->GetPreferredSize());
+  close_ = CreateCloseButton(this);
   close_->SetVisible(false);
   AddChildView(close_);
 }
 
 BubbleFrameView::~BubbleFrameView() {}
 
+// static
+gfx::Insets BubbleFrameView::GetTitleInsets() {
+  return gfx::Insets(
+      kTitleTopInset, kTitleLeftInset, kTitleBottomInset, kTitleRightInset);
+}
+
+// static
+LabelButton* BubbleFrameView::CreateCloseButton(ButtonListener* listener) {
+  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
+  LabelButton* close = new LabelButton(listener, base::string16());
+  close->SetImage(CustomButton::STATE_NORMAL,
+                  *rb.GetImageNamed(IDR_CLOSE_DIALOG).ToImageSkia());
+  close->SetImage(CustomButton::STATE_HOVERED,
+                  *rb.GetImageNamed(IDR_CLOSE_DIALOG_H).ToImageSkia());
+  close->SetImage(CustomButton::STATE_PRESSED,
+                  *rb.GetImageNamed(IDR_CLOSE_DIALOG_P).ToImageSkia());
+  close->SetBorder(scoped_ptr<Border>());
+  close->SetSize(close->GetPreferredSize());
+  return close;
+}
+
 gfx::Rect BubbleFrameView::GetBoundsForClientView() const {
   gfx::Rect client_bounds = GetLocalBounds();
   client_bounds.Inset(GetInsets());
@@ -246,7 +253,7 @@ void BubbleFrameView::ButtonPressed(Button* sender, const ui::Event& event) {
 
 void BubbleFrameView::SetBubbleBorder(scoped_ptr<BubbleBorder> border) {
   bubble_border_ = border.get();
-  SetBorder(border.PassAs<Border>());
+  SetBorder(border.Pass());
 
   // Update the background, which relies on the border.
   set_background(new views::BubbleBackground(bubble_border_));
@@ -288,6 +295,14 @@ gfx::Rect BubbleFrameView::GetAvailableScreenBounds(const gfx::Rect& rect) {
       rect.CenterPoint()).work_area();
 }
 
+bool BubbleFrameView::IsCloseButtonVisible() const {
+  return close_->visible();
+}
+
+gfx::Rect BubbleFrameView::GetCloseButtonBounds() const {
+  return close_->bounds();
+}
+
 void BubbleFrameView::MirrorArrowIfOffScreen(
     bool vertical,
     const gfx::Rect& anchor_rect,