exo: Use aura::Windows instead of views::Views as exo::Surfaces.

components/exo/shell_surface.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/shell_surface.h"
 
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/window_state.h"
 #include "base/logging.h"
@@ skipping 49 matching lines @@
 }
 
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // ShellSurface, public:
 
 ShellSurface::ShellSurface(Surface* surface) : surface_(surface) {
   surface_->SetSurfaceDelegate(this);
   surface_->AddSurfaceObserver(this);
-  surface_->SetVisible(true);
-  surface_->SetEnabled(true);
+  surface_->Show();
+  set_owned_by_client();
 }
 
 ShellSurface::~ShellSurface() {
   if (surface_) {
     surface_->SetSurfaceDelegate(nullptr);
     surface_->RemoveSurfaceObserver(this);
   }
   if (widget_)
     widget_->CloseNow();
 }
 
 void ShellSurface::SetToplevel() {
   TRACE_EVENT0("exo", "ShellSurface::SetToplevel");
 
   if (widget_) {
     DLOG(WARNING) << "Shell surface already mapped";
     return;
   }
 
   views::Widget::InitParams params = CreateWidgetInitParams(this);
   params.bounds = gfx::Rect(gfx::Size(1, 1));
   widget_.reset(new views::Widget);
   widget_->Init(params);
   widget_->GetNativeWindow()->set_owned_by_parent(false);
+  widget_->GetNativeWindow()->SetName("ExoShellSurface");
+  widget_->GetNativeWindow()->AddChild(surface_);
 
   // The position of a standard top level shell surface is managed by Ash.
   ash::wm::GetWindowState(widget_->GetNativeWindow())
       ->set_window_position_managed(true);
 }
 
 void ShellSurface::SetMaximized() {
   TRACE_EVENT0("exo", "ShellSurface::SetMaximized");
 
   if (widget_) {
     DLOG(WARNING) << "Shell surface already mapped";
     return;
   }
 
   views::Widget::InitParams params = CreateWidgetInitParams(this);
   params.show_state = ui::SHOW_STATE_MAXIMIZED;
   widget_.reset(new views::Widget);
   widget_->Init(params);
   widget_->GetNativeWindow()->set_owned_by_parent(false);
+  widget_->GetNativeWindow()->SetName("ExoShellSurface");
+  widget_->GetNativeWindow()->AddChild(surface_);
 }
 
 void ShellSurface::SetFullscreen() {
   TRACE_EVENT0("exo", "ShellSurface::SetFullscreen");
 
   if (widget_) {
     DLOG(WARNING) << "Shell surface already mapped";
     return;
   }
 
   views::Widget::InitParams params = CreateWidgetInitParams(this);
   params.show_state = ui::SHOW_STATE_FULLSCREEN;
   widget_.reset(new views::Widget);
   widget_->Init(params);
   widget_->GetNativeWindow()->set_owned_by_parent(false);
+  widget_->GetNativeWindow()->SetName("ExoShellSurface");
+  widget_->GetNativeWindow()->AddChild(surface_);
 }
 
 void ShellSurface::SetTitle(const base::string16& title) {
   TRACE_EVENT1("exo", "ShellSurface::SetTitle", "title",
                base::UTF16ToUTF8(title));
 
   title_ = title;
   if (widget_)
     widget_->UpdateWindowTitle();
 }
@@ skipping 14 matching lines @@
   value->SetString("title", base::UTF16ToUTF8(title_));
   return value;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // SurfaceDelegate overrides:
 
 void ShellSurface::OnSurfaceCommit() {
   surface_->CommitSurfaceHierarchy();
   if (widget_) {
+    // Update surface bounds and widget size.
+    gfx::Point origin;
+    views::View::ConvertPointToWidget(this, &origin);
+    surface_->SetBounds(gfx::Rect(origin, surface_->layer()->size()));
     widget_->SetSize(widget_->non_client_view()->GetPreferredSize());
 
     // Show widget if not already visible.
-    if (!widget_->GetNativeWindow()->TargetVisibility())
+    if (!widget_->IsClosed() && !widget_->IsVisible())
       widget_->Show();
   }
 }
 
 bool ShellSurface::IsSurfaceSynchronized() const {
   // A shell surface is always desynchronized.
   return false;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ skipping 13 matching lines @@
 
 views::Widget* ShellSurface::GetWidget() {
   return widget_.get();
 }
 
 const views::Widget* ShellSurface::GetWidget() const {
   return widget_.get();
 }
 
 views::View* ShellSurface::GetContentsView() {
-  return surface_;
+  return this;
 }
 
 views::NonClientFrameView* ShellSurface::CreateNonClientFrameView(
     views::Widget* widget) {
   return new CustomFrameView(widget);
 }
 
+////////////////////////////////////////////////////////////////////////////////
+// views::Views overrides:
+
+gfx::Size ShellSurface::GetPreferredSize() const {
+  return surface_ ? surface_->GetPreferredSize() : gfx::Size();
+}
+
 }  // namespace exo