Merge ArcNotificationItem and ArcCustomNotificationItem

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 175 matching lines @@
 
   void RequestFocusOnCloseButton() override {
     if (owner_->close_button_)
       owner_->close_button_->RequestFocus();
     owner_->UpdateControlButtonsVisibility();
   }
 
   bool IsPinned() const override {
     if (!owner_->item_)
       return false;
-    return owner_->item_->pinned();
+    return owner_->item_->GetPinned();
   }
 
   void UpdateControlButtonsVisibility() override {
     owner_->UpdateControlButtonsVisibility();
   }
 
  private:
   ArcCustomNotificationView* const owner_;
 
   DISALLOW_COPY_AND_ASSIGN(ContentViewDelegate);
 };
 
 ArcCustomNotificationView::ControlButton::ControlButton(
     ArcCustomNotificationView* owner)
     : message_center::PaddedButton(owner), owner_(owner) {
   if (owner_->item_) {
     set_background(views::Background::CreateSolidBackground(
-        GetControlButtonBackgroundColor(owner_->item_->shown_contents())));
+        GetControlButtonBackgroundColor(owner_->item_->GetShownContents())));
   } else {
     set_background(views::Background::CreateSolidBackground(
         message_center::kControlButtonBackgroundColor));
   }
 }
 
 void ArcCustomNotificationView::ControlButton::OnFocus() {
   message_center::PaddedButton::OnFocus();
   owner_->UpdateControlButtonsVisibility();
 }
 
 void ArcCustomNotificationView::ControlButton::OnBlur() {
   message_center::PaddedButton::OnBlur();
   owner_->UpdateControlButtonsVisibility();
 }
 
-ArcCustomNotificationView::ArcCustomNotificationView(
-    ArcCustomNotificationItem* item)
+ArcCustomNotificationView::ArcCustomNotificationView(ArcNotificationItem* item)
     : item_(item),
-      notification_key_(item->notification_key()),
+      notification_key_(item->GetNotificationKey()),
       event_forwarder_(new EventForwarder(this)) {
   SetFocusBehavior(FocusBehavior::ALWAYS);
 
   item_->IncrementWindowRefCount();
   item_->AddObserver(this);
 
-  ArcNotificationSurfaceManager::Get()->AddObserver(this);
-  exo::NotificationSurface* surface =
-      ArcNotificationSurfaceManager::Get()->GetSurface(notification_key_);
-  if (surface)
-    OnNotificationSurfaceAdded(surface);
+  if (ArcNotificationSurfaceManager::Get()) {

[hidehiko, 2017/05/01 12:29:17]

Optional/nit:

auto* surface_manager = ArcNotificationSurfaceManager::Get();
if (surface_manager) {
  surface_manager->AddObserver(this);
  ...
}

may be slightly consistent?

[yoshiki, 2017/05/08 06:24:52]

Done.

+    ArcNotificationSurfaceManager::Get()->AddObserver(this);
+    exo::NotificationSurface* surface =
+        ArcNotificationSurfaceManager::Get()->GetSurface(notification_key_);
+    if (surface)
+      OnNotificationSurfaceAdded(surface);
+  }
 
   // Create a layer as an anchor to insert surface copy during a slide.
   SetPaintToLayer();
   UpdatePreferredSize();
 }
 
 ArcCustomNotificationView::~ArcCustomNotificationView() {
   SetSurface(nullptr);
   if (item_) {
     item_->DecrementWindowRefCount();

[hidehiko, 2017/05/01 12:29:17]

Please call clean up functions in the reverse order of the ctor.
So,

ArcNotificationSurfaceManager::Get()->RemoveObserver(this);
item_->RemoveObserver(this);
item_->DecrementWindowRefCount();
(with null check).

[yoshiki, 2017/05/08 06:24:52]

Done.

     item_->RemoveObserver(this);
   }
 
   if (ArcNotificationSurfaceManager::Get())
     ArcNotificationSurfaceManager::Get()->RemoveObserver(this);
 }
 
 std::unique_ptr<message_center::CustomNotificationContentViewDelegate>
 ArcCustomNotificationView::CreateContentViewDelegate() {
   return base::MakeUnique<ArcCustomNotificationView::ContentViewDelegate>(this);
@@ skipping 37 matching lines @@
     return;
 
   // Creates the control_buttons_view_, which collects all control buttons into
   // a horizontal box.
   control_buttons_view_ = new views::View();
   control_buttons_view_->SetLayoutManager(
       new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0, 0));
 
   if (item_->IsOpeningSettingsSupported())
     CreateSettingsButton();
-  if (!item_->pinned())
+  if (!item_->GetPinned())
     CreateCloseButton();
 
   views::Widget::InitParams params(views::Widget::InitParams::TYPE_CONTROL);
   params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;
   params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   params.parent = surface_->window();
 
   floating_control_buttons_widget_.reset(new views::Widget);
   floating_control_buttons_widget_->Init(params);
   floating_control_buttons_widget_->SetContentsView(control_buttons_view_);
@@ skipping 29 matching lines @@
 
     MaybeCreateFloatingControlButtons();
 
     if (GetWidget())
       AttachSurface();
   }
 }
 
 void ArcCustomNotificationView::UpdatePreferredSize() {
   gfx::Size preferred_size =
-      surface_ ? surface_->GetSize() : item_ ? item_->snapshot().size()
-                                             : gfx::Size();
+      surface_ ? surface_->GetSize()

[hidehiko, 2017/05/01 12:29:17]

Optional/nit:

Maybe better to avoid nested "?:" operator?

gfx::Size preferred_size;
if (surface_)
  preferred_size = surface_->GetSize();
else if(item_)
  item_->GetSnapshot().size();

[yoshiki, 2017/05/08 06:24:52]

Done.

+               : item_ ? item_->GetSnapshot().size() : gfx::Size();
   if (preferred_size.IsEmpty())
     return;
 
   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);
   }
 
@@ skipping 26 matching lines @@
   if (target_visiblity)
     floating_control_buttons_widget_->Show();
   else
     floating_control_buttons_widget_->Hide();
 }
 
 void ArcCustomNotificationView::UpdatePinnedState() {
   if (!item_)
     return;
 
-  if (item_->pinned() && close_button_) {
+  if (item_->GetPinned() && close_button_) {
     control_buttons_view_->RemoveChildView(close_button_.get());
     close_button_.reset();
     Layout();
-  } else if (!item_->pinned() && !close_button_) {
+  } else if (!item_->GetPinned() && !close_button_) {
     CreateCloseButton();
     Layout();
   }
 }
 
 void ArcCustomNotificationView::UpdateSnapshot() {
   // Bail if we have a |surface_| because it controls the sizes and paints UI.
   if (surface_)
     return;
 
@@ skipping 33 matching lines @@
   control_button_color_animation_->Start();
 }
 
 bool ArcCustomNotificationView::ShouldUpdateControlButtonsColor() const {
   // Don't update the control button color when we are about to be destroyed.
   if (!item_)
     return false;
 
   if (settings_button_ &&
       settings_button_->background()->get_color() !=
-          GetControlButtonBackgroundColor(item_->shown_contents()))
+          GetControlButtonBackgroundColor(item_->GetShownContents()))
     return true;
   if (close_button_ &&
       close_button_->background()->get_color() !=
-          GetControlButtonBackgroundColor(item_->shown_contents()))
+          GetControlButtonBackgroundColor(item_->GetShownContents()))
     return true;
   return false;
 }
 
 void ArcCustomNotificationView::ViewHierarchyChanged(
     const views::View::ViewHierarchyChangedDetails& details) {
   views::Widget* widget = GetWidget();
 
   if (!details.is_add) {
     // Resets slide helper when this view is removed from its parent.
@@ skipping 64 matching lines @@
 
   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())
+  if (surface_ || !item_ || item_->GetSnapshot().isNull())
     return;
   const gfx::Rect contents_bounds = GetContentsBounds();
-  canvas->DrawImageInt(item_->snapshot(), 0, 0, item_->snapshot().width(),
-                       item_->snapshot().height(), contents_bounds.x(),
+  canvas->DrawImageInt(item_->GetSnapshot(), 0, 0, item_->GetSnapshot().width(),
+                       item_->GetSnapshot().height(), contents_bounds.x(),
                        contents_bounds.y(), contents_bounds.width(),
                        contents_bounds.height(), false);
 }
 
 void ArcCustomNotificationView::OnKeyEvent(ui::KeyEvent* event) {
   // Forward to parent CustomNotificationView to handle keyboard dismissal.
   parent()->OnKeyEvent(event);
 }
 
 void ArcCustomNotificationView::OnGestureEvent(ui::GestureEvent* event) {
@@ skipping 54 matching lines @@
 bool ArcCustomNotificationView::OnMousePressed(const ui::MouseEvent& event) {
   // TODO(yhanada): Remove this hack as soon as possible after letting
   // accessible actions be delivered to this view.
   // All mouse clicks or touches should be sent to corresponding Android view
   // because the surface is on this view, so receiving a mouse pressed event
   // means the event is generated by automation API.
   // We can distinguish events from automation API by checking the target of the
   // event because the target of all events generated by automation API is set
   // to nullptr.
   if (event.IsOnlyLeftMouseButton() && item_ &&
-      item_->expand_state() != mojom::ArcNotificationExpandState::FIXED_SIZE &&
+      item_->GetExpandState() !=
+          mojom::ArcNotificationExpandState::FIXED_SIZE &&
       event.target() == nullptr) {
     item_->ToggleExpansion();
     return true;
   }
   return false;
 }
 
 void ArcCustomNotificationView::ButtonPressed(views::Button* sender,
                                               const ui::Event& event) {
-  if (item_ && !item_->pinned() && sender == close_button_.get()) {
+  if (item_ && !item_->GetPinned() && sender == close_button_.get()) {
     CHECK_EQ(message_center::CustomNotificationView::kViewClassName,
              parent()->GetClassName());
     static_cast<message_center::CustomNotificationView*>(parent())
         ->OnCloseButtonPressed();
   }
   if (item_ && settings_button_ && sender == settings_button_) {
     item_->OpenSettings();
   }
 }
 
@@ skipping 49 matching lines @@
   DCHECK_EQ(animation, control_button_color_animation_.get());
   control_button_color_animation_.reset();
 }
 
 void ArcCustomNotificationView::AnimationProgressed(
     const gfx::Animation* animation) {
   DCHECK_EQ(animation, control_button_color_animation_.get());
 
   if (item_) {
     const SkColor target =
-        GetControlButtonBackgroundColor(item_->shown_contents());
+        GetControlButtonBackgroundColor(item_->GetShownContents());
     const SkColor start =
         target == message_center::kControlButtonBackgroundColor
             ? SK_ColorTRANSPARENT
             : message_center::kControlButtonBackgroundColor;
     const SkColor current_color = gfx::Tween::ColorValueBetween(
         animation->GetCurrentValue(), start, target);
     if (settings_button_) {
       settings_button_->set_background(
           views::Background::CreateSolidBackground(current_color));
       settings_button_->SchedulePaint();
     }
     if (close_button_) {
       close_button_->set_background(
           views::Background::CreateSolidBackground(current_color));
       close_button_->SchedulePaint();
     }
   }
 }
 
 }  // namespace arc