exo: Implement version 2 of remote shell interface.

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/common/shell_window_ids.h"
@@ skipping 91 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::WrapUnique(new ShellSurface(
-      surface, nullptr, gfx::Rect(), true /* activatable */,
-      true /* resizeable */, ash::kShellWindowId_DefaultContainer));
+  return base::WrapUnique(
+      new ShellSurface(surface, nullptr, gfx::Rect(), true /* activatable */,
+                       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->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 relative to the
+  // container origin.
+  gfx::Rect initial_bounds(position, gfx::Size(1, 1));
+  aura::Window::ConvertRectToTarget(
+      ShellSurface::GetMainSurface(parent->GetWidget()->GetNativeWindow()),
+      parent->GetWidget()->GetNativeWindow()->parent(), &initial_bounds);
+
   return base::WrapUnique(
-      new ShellSurface(surface, parent, gfx::Rect(position, gfx::Size(1, 1)),
-                       false /* activatable */, true /* resizeable */,
+      new ShellSurface(surface, parent, initial_bounds, false /* activatable */,
                        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;
   }
 
   return base::WrapUnique(new ShellSurface(surface, nullptr, gfx::Rect(1, 1),
-                                           true /* activatable */,
-                                           false /* resizeable */, container));
+                                           true /* activatable */, container));
 }
 
 std::unique_ptr<SubSurface> Display::CreateSubSurface(Surface* surface,
                                                       Surface* parent) {
   TRACE_EVENT2("exo", "Display::CreateSubSurface", "surface",
                surface->AsTracedValue(), "parent", parent->AsTracedValue());
 
   if (surface->Contains(parent)) {
     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;
   }
 
   return base::WrapUnique(new SubSurface(surface, parent));
 }
 
 }  // namespace exo