exo: Improved implementation of child surfaces and popups.

components/exo/shell_surface.h

 // 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.
 
 #ifndef COMPONENTS_EXO_SHELL_SURFACE_H_
 #define COMPONENTS_EXO_SHELL_SURFACE_H_
 
 #include <string>
 
 #include "ash/wm/window_state_observer.h"
@@ skipping 21 matching lines @@
 class ShellSurface : public SurfaceDelegate,
                      public SurfaceObserver,
                      public views::WidgetDelegate,
                      public views::View,
                      public ash::wm::WindowStateObserver,
                      public aura::WindowObserver,
                      public aura::client::ActivationChangeObserver {
  public:
   ShellSurface(Surface* surface,
                ShellSurface* parent,
-               const gfx::Rect& initial_bounds);
+               const gfx::Rect& initial_bounds,
+               bool activatable);
   explicit ShellSurface(Surface* surface);
   ~ShellSurface() override;
 
   // Set the callback to run when the user wants the shell surface to be closed.
   // The receiver can chose to not close the window on this signal.
   void set_close_callback(const base::Closure& close_callback) {
     close_callback_ = close_callback;
   }
 
   // Set the callback to run when the surface is destroyed.
@@ skipping 59 matching lines @@
 
   // Overridden from SurfaceDelegate:
   void OnSurfaceCommit() override;
   bool IsSurfaceSynchronized() const override;
 
   // Overridden from SurfaceObserver:
   void OnSurfaceDestroying(Surface* surface) override;
 
   // Overridden from views::WidgetDelegate:
   base::string16 GetWindowTitle() const override;
+  void WindowClosing() override;
   views::Widget* GetWidget() override;
   const views::Widget* GetWidget() const override;
   views::View* GetContentsView() override;
   views::NonClientFrameView* CreateNonClientFrameView(
       views::Widget* widget) override;
   bool WidgetHasHitTestMask() const override;
   void GetWidgetHitTestMask(gfx::Path* mask) const override;
 
   // Overridden from views::View:
   gfx::Size GetPreferredSize() const override;
@@ skipping 11 matching lines @@
       aura::Window* gained_active,
       aura::Window* lost_active) override;
 
  private:
   // Creates the |widget_| for |surface_|.
   void CreateShellSurfaceWidget();
 
   // Asks the client to configure its surface.
   void Configure();
 
-  scoped_ptr<views::Widget> widget_;
+  // Returns the "visible bounds" for the surface from the user's perspective.
+  gfx::Rect GetVisibleBounds() const;
+
+  views::Widget* widget_;
   Surface* surface_;
   aura::Window* parent_;
   const gfx::Rect initial_bounds_;
+  const bool activatable_;
   base::string16 title_;
   std::string application_id_;
   gfx::Rect geometry_;
   base::Closure close_callback_;
   base::Closure surface_destroyed_callback_;
   ConfigureCallback configure_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(ShellSurface);
 };
 
 }  // namespace exo
 
 #endif  // COMPONENTS_EXO_SHELL_SURFACE_H_