Add unittests of ArcCustomNotificationView

components/exo/notification_surface_impl.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 "components/exo/notification_surface.h"
+#include "components/exo/notification_surface_impl.h"
 
 #include "components/exo/notification_surface_manager.h"
 #include "components/exo/surface.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_delegate.h"
 #include "ui/base/cursor/cursor.h"
 #include "ui/base/hit_test.h"
 #include "ui/gfx/geometry/rect.h"
+#include "ui/views/controls/native/native_view_host.h"
 #include "ui/views/widget/widget.h"
 
 namespace exo {
 
 namespace {
 
 class CustomWindowDelegate : public aura::WindowDelegate {
  public:
   explicit CustomWindowDelegate(Surface* surface) : surface_(surface) {}
   ~CustomWindowDelegate() override {}
@@ skipping 36 matching lines @@
   }
 
  private:
   Surface* const surface_;
 
   DISALLOW_COPY_AND_ASSIGN(CustomWindowDelegate);
 };
 
 }  // namespace
 
-NotificationSurface::NotificationSurface(NotificationSurfaceManager* manager,
-                                         Surface* surface,
-                                         const std::string& notification_id)
+NotificationSurfaceImpl::NotificationSurfaceImpl(
+    NotificationSurfaceManager* manager,
+    Surface* surface,
+    const std::string& notification_id)
     : manager_(manager),
       surface_(surface),
       notification_id_(notification_id),
       window_(new aura::Window(new CustomWindowDelegate(surface))) {
   surface_->SetSurfaceDelegate(this);
   surface_->AddSurfaceObserver(this);
 
   window_->SetType(ui::wm::WINDOW_TYPE_CONTROL);
   window_->SetName("ExoNotificationSurface");
   window_->Init(ui::LAYER_NOT_DRAWN);
   window_->set_owned_by_parent(false);
 
   // TODO(xiyuan): Fix after Surface no longer has an aura::Window.
   window_->AddChild(surface_->window());
   surface_->window()->Show();
 }
 
-NotificationSurface::~NotificationSurface() {
+NotificationSurfaceImpl::~NotificationSurfaceImpl() {
   if (surface_) {
     surface_->SetSurfaceDelegate(nullptr);
     surface_->RemoveSurfaceObserver(this);
   }
   if (added_to_manager_)
     manager_->RemoveSurface(this);
 }
 
-gfx::Size NotificationSurface::GetSize() const {
+gfx::Size NotificationSurfaceImpl::GetSize() const {
   return surface_->content_size();
 }
 
-void NotificationSurface::OnSurfaceCommit() {
+void NotificationSurfaceImpl::AttachWindow(views::NativeViewHost* nvh) {

[hidehiko, 2017/03/02 15:38:16]

Could you avoid non-trivial abbreviation?

+  nvh->Attach(window());
+}
+
+aura::Window* NotificationSurfaceImpl::window() {
+  return window_.get();
+}
+
+const std::string& NotificationSurfaceImpl::notification_id() const {
+  return notification_id_;
+}
+
+void NotificationSurfaceImpl::OnSurfaceCommit() {
   surface_->CheckIfSurfaceHierarchyNeedsCommitToNewSurfaces();
   surface_->CommitSurfaceHierarchy();
 
   gfx::Rect bounds = window_->bounds();
   if (bounds.size() != surface_->content_size()) {
     bounds.set_size(surface_->content_size());
     window_->SetBounds(bounds);
   }
 
   // Defer AddSurface until there are contents to show.
   if (!added_to_manager_ && !surface_->content_size().IsEmpty()) {
     added_to_manager_ = true;
     manager_->AddSurface(this);
   }
 }
 
-bool NotificationSurface::IsSurfaceSynchronized() const {
+bool NotificationSurfaceImpl::IsSurfaceSynchronized() const {
   return false;
 }
 
-void NotificationSurface::OnSurfaceDestroying(Surface* surface) {
+void NotificationSurfaceImpl::OnSurfaceDestroying(Surface* surface) {
   window_.reset();
   surface->RemoveSurfaceObserver(this);
   surface_ = nullptr;
 }
 
 }  // namespace exo