exo: Refactor ShellSurface and WaylandRemoteShell

components/exo/display.cc

 // Copyright 2015 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/display.h"
 
 #include <iterator>
 #include <utility>
 
 #include "ash/public/cpp/shell_window_ids.h"
@@ skipping 123 matching lines @@
 std::unique_ptr<ShellSurface> Display::CreateShellSurface(Surface* surface) {
   TRACE_EVENT1("exo", "Display::CreateShellSurface", "surface",
                surface->AsTracedValue());
 
   if (surface->HasSurfaceDelegate()) {
     DLOG(ERROR) << "Surface has already been assigned a role";
     return nullptr;
   }
 
   return base::MakeUnique<ShellSurface>(
-      surface, nullptr, gfx::Rect(), true /* activatable */,
-      false /* can_minimize */, ash::kShellWindowId_DefaultContainer);
+      surface, nullptr, ShellSurface::BoundsMode::SHELL, gfx::Point(),
+      true /* activatable */, false /* can_minimize */,
+      ash::kShellWindowId_DefaultContainer);
 }
 
 std::unique_ptr<ShellSurface> Display::CreatePopupShellSurface(
     Surface* surface,
     ShellSurface* parent,
     const gfx::Point& position) {
   TRACE_EVENT2("exo", "Display::CreatePopupShellSurface", "surface",
                surface->AsTracedValue(), "parent", parent->AsTracedValue());
 
   if (surface->window()->Contains(parent->GetWidget()->GetNativeWindow())) {
     DLOG(ERROR) << "Parent is contained within surface's hierarchy";
     return nullptr;
   }
 
   if (surface->HasSurfaceDelegate()) {
     DLOG(ERROR) << "Surface has already been assigned a role";
     return nullptr;
   }
 
-  // Determine the initial bounds for popup. |position| is relative to the
-  // parent's main surface origin and initial bounds are in screen coordinates.
+  // |position| is relative to the parent's main surface origin, and |origin| is
+  // in screen coordinates.
   gfx::Point origin = position;
   wm::ConvertPointToScreen(
       ShellSurface::GetMainSurface(parent->GetWidget()->GetNativeWindow())
           ->window(),
       &origin);
-  gfx::Rect initial_bounds(origin, gfx::Size(1, 1));
 
   return base::MakeUnique<ShellSurface>(
-      surface, parent, initial_bounds, false /* activatable */,
-      false /* can_minimize */, ash::kShellWindowId_DefaultContainer);
+      surface, parent, ShellSurface::BoundsMode::FIXED, origin,
+      false /* activatable */, false /* can_minimize */,
+      ash::kShellWindowId_DefaultContainer);
 }
 
 std::unique_ptr<ShellSurface> Display::CreateRemoteShellSurface(
     Surface* surface,
     int container) {
   TRACE_EVENT2("exo", "Display::CreateRemoteShellSurface", "surface",
                surface->AsTracedValue(), "container", container);
 
   if (surface->HasSurfaceDelegate()) {
     DLOG(ERROR) << "Surface has already been assigned a role";
     return nullptr;
   }
 
   // Remote shell surfaces in system modal container cannot be minimized.
   bool can_minimize = container != ash::kShellWindowId_SystemModalContainer;
 
-  return base::MakeUnique<ShellSurface>(surface, nullptr, gfx::Rect(1, 1),
-                                        true /* activatable */, can_minimize,
-                                        container);
+  return base::MakeUnique<ShellSurface>(
+      surface, nullptr, ShellSurface::BoundsMode::CLIENT, gfx::Point(),
+      true /* activatable */, can_minimize, container);
 }
 
 std::unique_ptr<SubSurface> Display::CreateSubSurface(Surface* surface,
                                                       Surface* parent) {
   TRACE_EVENT2("exo", "Display::CreateSubSurface", "surface",
                surface->AsTracedValue(), "parent", parent->AsTracedValue());
 
   if (surface->window()->Contains(parent->window())) {
     DLOG(ERROR) << "Parent is contained within surface's hierarchy";
     return nullptr;
@@ skipping 17 matching lines @@
       notification_surface_manager_->GetSurface(notification_id)) {
     DLOG(ERROR) << "Invalid notification id, id=" << notification_id;
     return nullptr;
   }
 
   return base::MakeUnique<NotificationSurface>(notification_surface_manager_,
                                                surface, notification_id);
 }
 
 }  // namespace exo