Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / views / fullscreen_exit_bubble_views.cc

diff --git a/src/chrome/browser/ui/views/fullscreen_exit_bubble_views.cc b/src/chrome/browser/ui/views/fullscreen_exit_bubble_views.cc
index ecdb2c0..7dedaa1 100644 (file)
--- a/src/chrome/browser/ui/views/fullscreen_exit_bubble_views.cc
+++ b/src/chrome/browser/ui/views/fullscreen_exit_bubble_views.cc
@@ -48,7 +48,7 @@ class ButtonView : public views::View {
   virtual ~ButtonView();
 
   // Returns an empty size when the view is not visible.
-  virtual gfx::Size GetPreferredSize() OVERRIDE;
+  virtual gfx::Size GetPreferredSize() const OVERRIDE;
 
   views::LabelButton* accept_button() const { return accept_button_; }
   views::LabelButton* deny_button() const { return deny_button_; }
@@ -81,7 +81,7 @@ ButtonView::ButtonView(views::ButtonListener* listener,
 ButtonView::~ButtonView() {
 }
 
-gfx::Size ButtonView::GetPreferredSize() {
+gfx::Size ButtonView::GetPreferredSize() const {
   return visible() ? views::View::GetPreferredSize() : gfx::Size();
 }
 
@@ -225,7 +225,7 @@ void FullscreenExitBubbleViews::FullscreenExitView::UpdateContent(
     mouse_lock_exit_instruction_->SetVisible(false);
     button_view_->SetVisible(true);
     button_view_->deny_button()->SetText(bubble_->GetCurrentDenyButtonText());
-    button_view_->deny_button()->set_min_size(gfx::Size());
+    button_view_->deny_button()->SetMinSize(gfx::Size());
   } else {
     bool link_visible = true;
     base::string16 accelerator;
@@ -281,7 +281,6 @@ FullscreenExitBubbleViews::FullscreenExitBubbleViews(
   popup_ = new views::Widget;
   views::Widget::InitParams params(views::Widget::InitParams::TYPE_POPUP);
   params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;
-  params.can_activate = false;
   params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   params.parent = browser_view_->GetWidget()->GetNativeView();
   params.bounds = GetPopupRect(false);