Adjust behavior of control buttons of notifications.

ui/arc/notification/arc_custom_notification_view.cc

 // 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.
 
 #include "ui/arc/notification/arc_custom_notification_view.h"
 
 #include "ash/wm/window_util.h"
 #include "base/auto_reset.h"
 #include "base/memory/ptr_util.h"
 #include "components/exo/notification_surface.h"
@@ skipping 149 matching lines @@
 
   bool IsCloseButtonFocused() const override {
     if (owner_->close_button_ == nullptr)
       return false;
     return owner_->close_button_->HasFocus();
   }
 
   void RequestFocusOnCloseButton() override {
     if (owner_->close_button_)
       owner_->close_button_->RequestFocus();
-    owner_->UpdateControlButtonsVisiblity();
+    owner_->UpdateControlButtonsVisibility();
   }
 
   bool IsPinned() const override {
     return owner_->item_->pinned();
   }
 
+  void UpdateControlButtonsVisibility() override {
+    owner_->UpdateControlButtonsVisibility();
+  }
+
  private:
   ArcCustomNotificationView* const owner_;
 
   DISALLOW_COPY_AND_ASSIGN(ContentViewDelegate);
 };
 
 class ArcCustomNotificationView::ControlButton
     : public message_center::PaddedButton {
  public:
   explicit ControlButton(ArcCustomNotificationView* owner)
       : message_center::PaddedButton(owner), owner_(owner) {}
 
   void OnFocus() override {
     message_center::PaddedButton::OnFocus();
-    owner_->UpdateControlButtonsVisiblity();
+    owner_->UpdateControlButtonsVisibility();
   }
 
   void OnBlur() override {
     message_center::PaddedButton::OnBlur();
-    owner_->UpdateControlButtonsVisiblity();
+    owner_->UpdateControlButtonsVisibility();
   }
 
  private:
   ArcCustomNotificationView* const owner_;
 };
 
 ArcCustomNotificationView::ArcCustomNotificationView(
     ArcCustomNotificationItem* item)
     : item_(item),
       notification_key_(item->notification_key()),
@@ skipping 111 matching lines @@
   if (preferred_size.width() != message_center::kNotificationWidth) {
     const float scale = static_cast<float>(message_center::kNotificationWidth) /
                         preferred_size.width();
     preferred_size.SetSize(message_center::kNotificationWidth,
                            preferred_size.height() * scale);
   }
 
   SetPreferredSize(preferred_size);
 }
 
-void ArcCustomNotificationView::UpdateControlButtonsVisiblity() {
+void ArcCustomNotificationView::UpdateControlButtonsVisibility() {
   if (!surface_ || !floating_control_buttons_widget_)
     return;
 
   const bool target_visiblity =
       surface_->window()->GetBoundsInScreen().Contains(
           display::Screen::GetScreen()->GetCursorScreenPoint()) ||
       close_button_->HasFocus() || settings_button_->HasFocus();
   if (target_visiblity == floating_control_buttons_widget_->IsVisible())
     return;
 
@@ skipping 99 matching lines @@
     return;
 
   gfx::Rect control_buttons_bounds(contents_bounds);
   const int buttons_width = close_button_->GetPreferredSize().width() +
                             settings_button_->GetPreferredSize().width();
   control_buttons_bounds.set_x(control_buttons_bounds.right() - buttons_width);
   control_buttons_bounds.set_height(close_button_->GetPreferredSize().height());
   control_buttons_bounds.set_width(buttons_width);
   floating_control_buttons_widget_->SetBounds(control_buttons_bounds);
 
-  UpdateControlButtonsVisiblity();
+  UpdateControlButtonsVisibility();
 
   ash::wm::SnapWindowToPixelBoundary(surface_->window());
 }
 
 void ArcCustomNotificationView::OnPaint(gfx::Canvas* canvas) {
   views::NativeViewHost::OnPaint(canvas);
 
   // Bail if there is a |surface_| or no item or no snapshot image.
   if (surface_ || !item_ || item_->snapshot().isNull())
     return;
@@ skipping 12 matching lines @@
 void ArcCustomNotificationView::OnGestureEvent(ui::GestureEvent* event) {
   // Forward to parent CustomNotificationView to handle sliding out.
   parent()->OnGestureEvent(event);
 
   // |slide_helper_| could be null before |surface_| is attached.
   if (slide_helper_)
     slide_helper_->Update();
 }
 
 void ArcCustomNotificationView::OnMouseEntered(const ui::MouseEvent&) {
-  UpdateControlButtonsVisiblity();
+  UpdateControlButtonsVisibility();
 }
 
 void ArcCustomNotificationView::OnMouseExited(const ui::MouseEvent&) {
-  UpdateControlButtonsVisiblity();
+  UpdateControlButtonsVisibility();
 }
 
 void ArcCustomNotificationView::OnFocus() {
   NativeViewHost::OnFocus();
   static_cast<message_center::CustomNotificationView*>(parent())
       ->OnContentFocused();
 }
 
 void ArcCustomNotificationView::OnBlur() {
   NativeViewHost::OnBlur();
@@ skipping 57 matching lines @@
 
 void ArcCustomNotificationView::OnNotificationSurfaceRemoved(
     exo::NotificationSurface* surface) {
   if (surface->notification_id() != notification_key_)
     return;
 
   SetSurface(nullptr);
 }
 
 }  // namespace arc